From 1408f225d9c9bf296b5e2a69f0e25f7f8097abfb Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 4 Feb 2025 22:20:05 +0800
Subject: [PATCH 001/127] wip [skip ci]

---
 .../dts-test/defineComponent.test-d.tsx       |  57 +-
 .../runtime-core/__tests__/apiOptions.spec.ts |   2 +-
 .../runtime-core/src/apiDefineComponent.ts    | 299 ++++++-----
 packages/runtime-core/src/apiSetupHelpers.ts  |  36 +-
 packages/runtime-core/src/componentOptions.ts | 508 ++++--------------
 .../src/componentPublicInstance.ts            | 215 +++-----
 packages/runtime-core/src/h.ts                |  16 +-
 packages/runtime-core/src/index.ts            |   7 +-
 .../__tests__/customElement.spec.ts           |   3 +-
 packages/runtime-dom/src/apiCustomElement.ts  |  76 ++-
 packages/shared/src/typeUtils.ts              |   6 -
 11 files changed, 420 insertions(+), 805 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index fda3ca4856c..75bbcd09d92 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1663,7 +1663,6 @@ declare const MyButton: DefineComponent<
   ComponentOptionsMixin,
   ComponentOptionsMixin,
   EmitsOptions,
-  string,
   VNodeProps & AllowedComponentProps & ComponentCustomProps,
   Readonly<ExtractPropTypes<{}>>,
   {},
@@ -1852,7 +1851,7 @@ interface ErrorMessageSlotProps {
  * relying on legacy CreateComponentPublicInstance signature
  */
 declare const ErrorMessage: {
-  new (...args: any[]): vue.CreateComponentPublicInstance<
+  new (...args: any[]): vue.CreateComponentPublicInstanceWithMixins<
     Readonly<
       vue.ExtractPropTypes<{
         as: {
@@ -1916,58 +1915,7 @@ declare const ErrorMessage: {
     },
     true,
     {},
-    {},
-    {
-      P: {}
-      B: {}
-      D: {}
-      C: {}
-      M: {}
-      Defaults: {}
-    },
-    Readonly<
-      vue.ExtractPropTypes<{
-        as: {
-          type: StringConstructor
-          default: any
-        }
-        name: {
-          type: StringConstructor
-          required: true
-        }
-      }>
-    >,
-    () =>
-      | VNode<
-          vue.RendererNode,
-          vue.RendererElement,
-          {
-            [key: string]: any
-          }
-        >
-      | vue.Slot<any>
-      | VNode<
-          vue.RendererNode,
-          vue.RendererElement,
-          {
-            [key: string]: any
-          }
-        >[]
-      | {
-          default: () => VNode<
-            vue.RendererNode,
-            vue.RendererElement,
-            {
-              [key: string]: any
-            }
-          >[]
-        },
-    {},
-    {},
-    {},
-    {
-      as: string
-    }
+    {}
   >
   __isFragment?: never
   __isTeleport?: never
@@ -2020,7 +1968,6 @@ declare const ErrorMessage: {
   {
     as: string
   },
-  {},
   string,
   {}
 > &
diff --git a/packages/runtime-core/__tests__/apiOptions.spec.ts b/packages/runtime-core/__tests__/apiOptions.spec.ts
index 1d4e805efce..ce00acf9e2b 100644
--- a/packages/runtime-core/__tests__/apiOptions.spec.ts
+++ b/packages/runtime-core/__tests__/apiOptions.spec.ts
@@ -1060,7 +1060,7 @@ describe('api: options', () => {
       },
       data() {
         return {
-          plusOne: (this as any).count + 1,
+          plusOne: this.count + 1,
         }
       },
       computed: {
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 2ce870f0141..d5ee0a7d572 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -1,47 +1,53 @@
+import { extend, isFunction, LooseRequired } from '@vue/shared'
+import type { ComponentTypeEmits } from './apiSetupHelpers'
+import type {
+  AllowedComponentProps,
+  Component,
+  ComponentCustomProps,
+  GlobalComponents,
+  GlobalDirectives,
+  SetupContext,
+} from './component'
+import type {
+  EmitsOptions,
+  EmitsToProps,
+  ObjectEmitsOptions,
+  TypeEmitsToOptions,
+} from './componentEmits'
 import type {
   ComponentInjectOptions,
   ComponentOptions,
   ComponentOptionsBase,
-  ComponentOptionsMixin,
   ComponentProvideOptions,
   ComputedOptions,
   MethodOptions,
   RenderFunction,
 } from './componentOptions'
-import type {
-  AllowedComponentProps,
-  Component,
-  ComponentCustomProps,
-  GlobalComponents,
-  GlobalDirectives,
-  SetupContext,
-} from './component'
 import type {
   ComponentObjectPropsOptions,
   ComponentPropsOptions,
   ExtractDefaultPropTypes,
   ExtractPropTypes,
 } from './componentProps'
-import type {
-  EmitsOptions,
-  EmitsToProps,
-  TypeEmitsToOptions,
-} from './componentEmits'
-import { type IsKeyValues, extend, isFunction } from '@vue/shared'
-import type { VNodeProps } from './vnode'
 import type {
   ComponentPublicInstanceConstructor,
   CreateComponentPublicInstanceWithMixins,
+  EnsureNonVoid,
+  ExtractMixinComputed,
+  ExtractMixinData,
+  ExtractMixinMethods,
+  ExtractMixinProps,
+  ExtractMixinSetupBindings,
 } from './componentPublicInstance'
 import type { SlotsType } from './componentSlots'
 import type { Directive } from './directives'
-import type { ComponentTypeEmits } from './apiSetupHelpers'
+import type { VNodeProps } from './vnode'
 
 export type PublicProps = VNodeProps &
   AllowedComponentProps &
   ComponentCustomProps
 
-type ResolveProps<PropsOrPropOptions, E extends EmitsOptions> = Readonly<
+type ResolveProps<PropsOrPropOptions, E extends ObjectEmitsOptions> = Readonly<
   PropsOrPropOptions extends ComponentPropsOptions
     ? ExtractPropTypes<PropsOrPropOptions>
     : PropsOrPropOptions
@@ -54,10 +60,9 @@ export type DefineComponent<
   D = {},
   C extends ComputedOptions = ComputedOptions,
   M extends MethodOptions = MethodOptions,
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
-  E extends EmitsOptions = {},
-  EE extends string = string,
+  Mixin = {},
+  Extends = {},
+  E extends ObjectEmitsOptions = {},
   PP = PublicProps,
   Props = ResolveProps<PropsOrPropOptions, E>,
   Defaults = ExtractDefaultPropTypes<PropsOrPropOptions>,
@@ -90,31 +95,25 @@ export type DefineComponent<
     TypeRefs,
     TypeEl
   >
-> &
-  ComponentOptionsBase<
-    Props,
-    RawBindings,
-    D,
-    C,
-    M,
-    Mixin,
-    Extends,
-    E,
-    EE,
-    Defaults,
-    {},
-    string,
-    S,
-    LC & GlobalComponents,
-    Directives & GlobalDirectives,
-    Exposed,
-    Provide
-  > &
+> & {
+  computed?: C
+  methods?: M
+  mixins?: Mixin[]
+  extends?: Extends
+  inject?: {}
+  slots?: S
+  components?: LC & GlobalComponents
+  directives?: Directives & GlobalDirectives
+  expose?: Exposed[]
+  provide?: Provide
+  setup?: () => RawBindings
+  data?: () => D
+} & ComponentOptionsBase &
   PP
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
-  E extends EmitsOptions = {},
+  E extends ObjectEmitsOptions = {},
   S extends SlotsType = SlotsType,
   Props = P & EmitsToProps<E>,
   PP = PublicProps,
@@ -126,8 +125,8 @@ export type DefineSetupFnComponent<
   {},
   {},
   {},
-  ComponentOptionsMixin,
-  ComponentOptionsMixin,
+  {},
+  {},
   E,
   PP,
   {},
@@ -148,7 +147,7 @@ type ToResolvedProps<Props, Emits extends EmitsOptions> = Readonly<Props> &
 // (uses user defined props interface)
 export function defineComponent<
   Props extends Record<string, any>,
-  E extends EmitsOptions = {},
+  E extends ObjectEmitsOptions = {},
   EE extends string = string,
   S extends SlotsType = {},
 >(
@@ -164,7 +163,7 @@ export function defineComponent<
 ): DefineSetupFnComponent<Props, E, S>
 export function defineComponent<
   Props extends Record<string, any>,
-  E extends EmitsOptions = {},
+  E extends ObjectEmitsOptions = {},
   EE extends string = string,
   S extends SlotsType = {},
 >(
@@ -181,22 +180,25 @@ export function defineComponent<
 
 // overload 2: defineComponent with options object, infer props from options
 export function defineComponent<
-  // props
+  // type options
   TypeProps,
+  TypeEmits extends ComponentTypeEmits | unknown = unknown,
+  TypeRefs extends Record<string, unknown> = {},
+  TypeEl extends Element = any,
+  // props
   RuntimePropsOptions extends
     ComponentObjectPropsOptions = ComponentObjectPropsOptions,
   RuntimePropsKeys extends string = string,
   // emits
-  TypeEmits extends ComponentTypeEmits = {},
-  RuntimeEmitsOptions extends EmitsOptions = {},
+  RuntimeEmitsOptions extends ObjectEmitsOptions = {},
   RuntimeEmitsKeys extends string = string,
   // other options
   Data = {},
   SetupBindings = {},
   Computed extends ComputedOptions = {},
   Methods extends MethodOptions = {},
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
+  Mixin = {},
+  Extends = {},
   InjectOptions extends ComponentInjectOptions = {},
   InjectKeys extends string = string,
   Slots extends SlotsType = {},
@@ -205,21 +207,110 @@ export function defineComponent<
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   // resolved types
-  ResolvedEmits extends EmitsOptions = {} extends RuntimeEmitsOptions
-    ? TypeEmitsToOptions<TypeEmits>
-    : RuntimeEmitsOptions,
-  InferredProps = IsKeyValues<TypeProps> extends true
-    ? TypeProps
-    : string extends RuntimePropsKeys
+  NormalizedEmitsOptions extends EmitsOptions = unknown extends TypeEmits
+    ? string extends RuntimeEmitsKeys
+      ? RuntimeEmitsOptions
+      : RuntimeEmitsKeys[]
+    : TypeEmitsToOptions<
+        TypeEmits extends ComponentTypeEmits ? TypeEmits : never
+      >,
+  InferredProps = unknown extends TypeProps
+    ? string extends RuntimePropsKeys
       ? ComponentObjectPropsOptions extends RuntimePropsOptions
         ? {}
         : ExtractPropTypes<RuntimePropsOptions>
-      : { [key in RuntimePropsKeys]?: any },
-  TypeRefs extends Record<string, unknown> = {},
-  TypeEl extends Element = any,
+      : { [key in RuntimePropsKeys]?: any }
+    : TypeProps,
+  ResolvedProps = ToResolvedProps<InferredProps, NormalizedEmitsOptions>,
+  // mixin inference
+  PublicP = ExtractMixinProps<Mixin> &
+    ExtractMixinProps<Extends> &
+    EnsureNonVoid<ResolvedProps>,
+  PublicB = ExtractMixinSetupBindings<Mixin> &
+    ExtractMixinSetupBindings<Extends> &
+    EnsureNonVoid<SetupBindings>,
+  PublicD = ExtractMixinData<Mixin> &
+    ExtractMixinData<Extends> &
+    EnsureNonVoid<Data>,
+  PublicC extends ComputedOptions = ExtractMixinComputed<Mixin> &
+    ExtractMixinComputed<Extends> &
+    EnsureNonVoid<Computed>,
+  PublicM extends MethodOptions = ExtractMixinMethods<Mixin> &
+    ExtractMixinMethods<Extends> &
+    EnsureNonVoid<Methods>,
+  PublicDefaults = {}, // TODO
+  // vm
+  DataVM = CreateComponentPublicInstanceWithMixins<
+    ResolvedProps,
+    SetupBindings,
+    {}, // Data
+    {}, // Computed
+    MethodOptions,
+    Mixin,
+    Extends,
+    NormalizedEmitsOptions
+  >,
+  OptionsVM = CreateComponentPublicInstanceWithMixins<
+    ResolvedProps,
+    SetupBindings,
+    Data,
+    Computed,
+    Methods,
+    Mixin,
+    Extends,
+    NormalizedEmitsOptions,
+    {}, // PublicProps
+    {}, // Defaults
+    false,
+    InjectOptions,
+    Slots,
+    LocalComponents,
+    Directives,
+    Exposed
+  >,
+  ReturnVM = CreateComponentPublicInstanceWithMixins<
+    ResolvedProps,
+    SetupBindings,
+    Data,
+    Computed,
+    Methods,
+    Mixin,
+    Extends,
+    NormalizedEmitsOptions,
+    PublicProps,
+    ExtractDefaultPropTypes<RuntimePropsOptions>,
+    // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+    // user props types verbatim
+    unknown extends TypeProps ? true : false,
+    {}, // InjectOptions
+    Slots,
+    LocalComponents & GlobalComponents,
+    Directives & GlobalDirectives,
+    Exposed,
+    TypeRefs,
+    TypeEl,
+    Provide
+  >,
 >(
   options: {
     props?: (RuntimePropsOptions & ThisType<void>) | RuntimePropsKeys[]
+    emits?: (RuntimeEmitsOptions & ThisType<void>) | RuntimeEmitsKeys[]
+    components?: LocalComponents
+    directives?: Directives
+    slots?: Slots
+    expose?: Exposed[]
+    computed?: Computed
+    methods?: Methods
+    provide?: Provide
+    inject?: InjectOptions | InjectKeys[]
+    mixins?: Mixin[]
+    extends?: Extends
+    setup?: (
+      this: void,
+      props: LooseRequired<PublicP>,
+      ctx: SetupContext<NormalizedEmitsOptions, Slots>,
+    ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
+    data?: (this: DataVM, vm: DataVM) => Data
     /**
      * @private for language-tools use only
      */
@@ -236,69 +327,29 @@ export function defineComponent<
      * @private for language-tools use only
      */
     __typeEl?: TypeEl
-  } & ComponentOptionsBase<
-    ToResolvedProps<InferredProps, ResolvedEmits>,
-    SetupBindings,
-    Data,
-    Computed,
-    Methods,
-    Mixin,
-    Extends,
-    RuntimeEmitsOptions,
-    RuntimeEmitsKeys,
-    {}, // Defaults
-    InjectOptions,
-    InjectKeys,
-    Slots,
-    LocalComponents,
-    Directives,
-    Exposed,
-    Provide
-  > &
-    ThisType<
-      CreateComponentPublicInstanceWithMixins<
-        ToResolvedProps<InferredProps, ResolvedEmits>,
-        SetupBindings,
-        Data,
-        Computed,
-        Methods,
-        Mixin,
-        Extends,
-        ResolvedEmits,
-        {},
-        {},
-        false,
-        InjectOptions,
-        Slots,
-        LocalComponents,
-        Directives,
-        Exposed
-      >
-    >,
-): DefineComponent<
-  InferredProps,
-  SetupBindings,
-  Data,
-  Computed,
-  Methods,
-  Mixin,
-  Extends,
-  ResolvedEmits,
-  RuntimeEmitsKeys,
-  PublicProps,
-  ToResolvedProps<InferredProps, ResolvedEmits>,
-  ExtractDefaultPropTypes<RuntimePropsOptions>,
-  Slots,
-  LocalComponents,
-  Directives,
-  Exposed,
-  Provide,
-  // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-  // user props types verbatim
-  unknown extends TypeProps ? true : false,
-  TypeRefs,
-  TypeEl
->
+  } & ComponentOptionsBase &
+    ThisType<OptionsVM>,
+): {
+  props?: string extends RuntimePropsKeys
+    ? ComponentObjectPropsOptions extends RuntimePropsOptions
+      ? {}
+      : RuntimePropsOptions
+    : RuntimePropsKeys[]
+  emits?: NormalizedEmitsOptions
+  components?: LocalComponents & GlobalComponents
+  directives?: Directives & GlobalDirectives
+  slots?: Slots
+  expose?: Exposed[]
+  computed?: Computed
+  methods?: Methods
+  provide?: Provide
+  inject?: string extends InjectKeys ? InjectOptions : InjectKeys[]
+  mixins?: Mixin[]
+  extends?: Extends
+  setup?(): SetupBindings
+  data?(): Data
+} & ComponentOptionsBase &
+  ComponentPublicInstanceConstructor<ReturnVM>
 
 // implementation, close to no-op
 /*! #__NO_SIDE_EFFECTS__ */
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 2ddaeb509ad..0f3ca2839fa 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -18,7 +18,6 @@ import {
 import type { EmitFn, EmitsOptions, ObjectEmitsOptions } from './componentEmits'
 import type {
   ComponentOptionsBase,
-  ComponentOptionsMixin,
   ComputedOptions,
   MethodOptions,
 } from './componentOptions'
@@ -31,6 +30,7 @@ import type {
 import { warn } from './warning'
 import type { SlotsType, StrictUnwrapSlotsType } from './componentSlots'
 import type { Ref } from '@vue/reactivity'
+import { CreateComponentPublicInstanceWithMixins } from './componentPublicInstance'
 
 // dev only
 const warnRuntimeUsage = (method: string) =>
@@ -189,23 +189,31 @@ export function defineExpose<
  * @see {@link https://vuejs.org/api/sfc-script-setup.html#defineoptions}
  */
 export function defineOptions<
-  RawBindings = {},
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
->(
-  options?: ComponentOptionsBase<
+  Mixin = {},
+  Extends = {},
+  DataVM = CreateComponentPublicInstanceWithMixins<
+    {},
+    {},
+    {},
     {},
-    RawBindings,
-    D,
-    C,
-    M,
+    MethodOptions,
     Mixin,
-    Extends,
-    {}
-  > & {
+    Extends
+  >,
+>(
+  options?: {
+    computed?: C
+    methods?: M
+    mixins?: Mixin[]
+    extends?: Extends
+    data?: (this: DataVM, vm: DataVM) => D
+    /**
+     * setup should be defined via `<script setup>`.
+     */
+    setup?: never
     /**
      * props should be defined via defineProps().
      */
@@ -222,7 +230,7 @@ export function defineOptions<
      * slots should be defined via defineSlots().
      */
     slots?: never
-  },
+  } & ComponentOptionsBase,
 ): void {
   if (__DEV__) {
     warnRuntimeUsage(`defineOptions`)
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 5db6a0a1760..6d1afc9fe3d 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -49,23 +49,13 @@ import {
   type WritableComputedOptions,
   reactive,
 } from '@vue/reactivity'
-import type {
-  ComponentObjectPropsOptions,
-  ComponentPropsOptions,
-  ExtractDefaultPropTypes,
-  ExtractPropTypes,
-} from './componentProps'
-import type {
-  EmitsOptions,
-  EmitsToProps,
-  TypeEmitsToOptions,
-} from './componentEmits'
+import type { ComponentPropsOptions } from './componentProps'
+import type { EmitsOptions, ObjectEmitsOptions } from './componentEmits'
 import type { Directive } from './directives'
 import {
   type ComponentPublicInstance,
   type CreateComponentPublicInstanceWithMixins,
-  type IntersectionMixin,
-  type UnwrapMixinsType,
+  ExtractMixinProps,
   isReservedPrefix,
 } from './componentPublicInstance'
 import { warn } from './warning'
@@ -81,10 +71,7 @@ import {
 import type { OptionMergeFunction } from './apiCreateApp'
 import { LifecycleHooks } from './enums'
 import type { SlotsType } from './componentSlots'
-import {
-  type ComponentTypeEmits,
-  normalizePropsOrEmits,
-} from './apiSetupHelpers'
+import { normalizePropsOrEmits } from './apiSetupHelpers'
 import { markAsyncBoundary } from './helpers/useId'
 
 /**
@@ -107,40 +94,25 @@ export interface ComponentCustomOptions {}
 
 export type RenderFunction = () => VNodeChild
 
-export interface ComponentOptionsBase<
-  Props,
-  RawBindings,
-  D,
-  C extends ComputedOptions,
-  M extends MethodOptions,
-  Mixin extends ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin,
-  E extends EmitsOptions,
-  EE extends string = string,
-  Defaults = {},
-  I extends ComponentInjectOptions = {},
-  II extends string = string,
-  S extends SlotsType = {},
-  LC extends Record<string, Component> = {},
-  Directives extends Record<string, Directive> = {},
-  Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions,
-> extends LegacyOptions<Props, D, C, M, Mixin, Extends, I, II, Provide>,
-    ComponentInternalOptions,
+export interface ComponentOptionsBase
+  extends ComponentInternalOptions,
     ComponentCustomOptions {
-  setup?: (
-    this: void,
-    props: LooseRequired<
-      Props &
-        Prettify<
-          UnwrapMixinsType<
-            IntersectionMixin<Mixin> & IntersectionMixin<Extends>,
-            'P'
-          >
-        >
-    >,
-    ctx: SetupContext<E, S>,
-  ) => Promise<RawBindings> | RawBindings | RenderFunction | void
+  components?: Record<string, Component>
+  directives?: Record<string, Directive>
+  slots?: unknown
+  expose?: string[]
+
+  //#region LegacyOptions
+  computed?: unknown // ComputedOptions
+  methods?: unknown // MethodOptions
+  provide?: unknown // ComponentProvideOptions
+  inject?: unknown // ComponentInjectOptions | string[]
+
+  // composition
+  mixins?: unknown
+  extends?: unknown
+  //#endregion
+
   name?: string
   template?: string | object // can be a direct DOM node
   // Note: we are intentionally using the signature-less `Function` type here
@@ -149,16 +121,7 @@ export interface ComponentOptionsBase<
   // Luckily `render()` doesn't need any arguments nor does it care about return
   // type.
   render?: Function
-  // NOTE: extending both LC and Record<string, Component> allows objects to be forced
-  // to be of type Component, while still inferring LC generic
-  components?: LC & Record<string, Component>
-  // NOTE: extending both Directives and Record<string, Directive> allows objects to be forced
-  // to be of type Directive, while still inferring Directives generic
-  directives?: Directives & Record<string, Directive>
   inheritAttrs?: boolean
-  emits?: (E | EE[]) & ThisType<void>
-  slots?: S
-  expose?: Exposed[]
   serverPrefetch?(): void | Promise<any>
 
   // Runtime compiler only -----------------------------------------------------
@@ -223,7 +186,42 @@ export interface ComponentOptionsBase<
   __isTeleport?: never
   __isSuspense?: never
 
-  __defaults?: Defaults
+  //#region LegacyOptions
+  compatConfig?: CompatConfig
+
+  // allow any custom options
+  [key: string]: any
+
+  watch?: ComponentWatchOptions
+
+  // assets
+  filters?: Record<string, Function>
+
+  // lifecycle
+  beforeCreate?(): any
+  created?(): any
+  beforeMount?(): any
+  mounted?(): any
+  beforeUpdate?(): any
+  updated?(): any
+  activated?(): any
+  deactivated?(): any
+  /** @deprecated use `beforeUnmount` instead */
+  beforeDestroy?(): any
+  beforeUnmount?(): any
+  /** @deprecated use `unmounted` instead */
+  destroyed?(): any
+  unmounted?(): any
+  renderTracked?: DebuggerHook
+  renderTriggered?: DebuggerHook
+  errorCaptured?: ErrorCapturedHook
+
+  /**
+   * runtime compile only
+   * @deprecated use `compilerOptions.delimiters` instead.
+   */
+  delimiters?: [string, string]
+  //#endregion
 }
 
 /**
@@ -242,10 +240,9 @@ export type ComponentOptions<
   D = any,
   C extends ComputedOptions = any,
   M extends MethodOptions = any,
-  Mixin extends ComponentOptionsMixin = any,
-  Extends extends ComponentOptionsMixin = any,
-  E extends EmitsOptions = any,
-  EE extends string = string,
+  Mixin = any,
+  Extends = any,
+  E extends ObjectEmitsOptions = any,
   Defaults = {},
   I extends ComponentInjectOptions = {},
   II extends string = string,
@@ -254,25 +251,37 @@ export type ComponentOptions<
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-> = ComponentOptionsBase<
-  Props,
-  RawBindings,
-  D,
-  C,
-  M,
-  Mixin,
-  Extends,
-  E,
-  EE,
-  Defaults,
-  I,
-  II,
-  S,
-  LC,
-  Directives,
-  Exposed,
-  Provide
-> &
+  DataVM = CreateComponentPublicInstanceWithMixins<
+    Props,
+    {},
+    {},
+    {},
+    MethodOptions,
+    Mixin,
+    Extends
+  >,
+> = {
+  computed?: C
+  methods?: M
+  mixins?: Mixin[]
+  extends?: Extends
+  inject?: string extends II ? I : II[]
+  slots?: S
+  components?: LC
+  directives?: Directives
+  expose?: Exposed[]
+  provide?: Provide
+  setup?: (
+    this: void,
+    props: NoInfer<
+      LooseRequired<
+        Props & Prettify<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+      >
+    >,
+    ctx: NoInfer<SetupContext<E, S>>,
+  ) => Promise<RawBindings> | RawBindings | RenderFunction | void
+  data?: (this: DataVM, vm: DataVM) => D
+} & ComponentOptionsBase &
   ThisType<
     CreateComponentPublicInstanceWithMixins<
       {},
@@ -293,26 +302,6 @@ export type ComponentOptions<
     >
   >
 
-export type ComponentOptionsMixin = ComponentOptionsBase<
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any
->
-
 export type ComputedOptions = Record<
   string,
   ComputedGetter<any> | WritableComputedOptions<any>
@@ -362,95 +351,6 @@ export type InjectToObject<T extends ComponentInjectOptions> =
         }
       : never
 
-interface LegacyOptions<
-  Props,
-  D,
-  C extends ComputedOptions,
-  M extends MethodOptions,
-  Mixin extends ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin,
-  I extends ComponentInjectOptions,
-  II extends string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions,
-> {
-  compatConfig?: CompatConfig
-
-  // allow any custom options
-  [key: string]: any
-
-  // state
-  // Limitation: we cannot expose RawBindings on the `this` context for data
-  // since that leads to some sort of circular inference and breaks ThisType
-  // for the entire component.
-  data?: (
-    this: CreateComponentPublicInstanceWithMixins<
-      Props,
-      {},
-      {},
-      {},
-      MethodOptions,
-      Mixin,
-      Extends
-    >,
-    vm: CreateComponentPublicInstanceWithMixins<
-      Props,
-      {},
-      {},
-      {},
-      MethodOptions,
-      Mixin,
-      Extends
-    >,
-  ) => D
-  computed?: C
-  methods?: M
-  watch?: ComponentWatchOptions
-  provide?: Provide
-  inject?: I | II[]
-
-  // assets
-  filters?: Record<string, Function>
-
-  // composition
-  mixins?: Mixin[]
-  extends?: Extends
-
-  // lifecycle
-  beforeCreate?(): any
-  created?(): any
-  beforeMount?(): any
-  mounted?(): any
-  beforeUpdate?(): any
-  updated?(): any
-  activated?(): any
-  deactivated?(): any
-  /** @deprecated use `beforeUnmount` instead */
-  beforeDestroy?(): any
-  beforeUnmount?(): any
-  /** @deprecated use `unmounted` instead */
-  destroyed?(): any
-  unmounted?(): any
-  renderTracked?: DebuggerHook
-  renderTriggered?: DebuggerHook
-  errorCaptured?: ErrorCapturedHook
-
-  /**
-   * runtime compile only
-   * @deprecated use `compilerOptions.delimiters` instead.
-   */
-  delimiters?: [string, string]
-
-  /**
-   * #3468
-   *
-   * type-only, used to assist Mixin's type inference,
-   * typescript will try to simplify the inferred `Mixin` type,
-   * with the `__differentiator`, typescript won't be able to combine different mixins,
-   * because the `__differentiator` will be different
-   */
-  __differentiator?: keyof D | keyof C | keyof M
-}
-
 type MergedHook<T = () => void> = T | T[]
 
 export type MergedComponentOptions = ComponentOptions &
@@ -476,24 +376,6 @@ export type MergedComponentOptionsOverride = {
   errorCaptured?: MergedHook<ErrorCapturedHook>
 }
 
-export type OptionTypesKeys = 'P' | 'B' | 'D' | 'C' | 'M' | 'Defaults'
-
-export type OptionTypesType<
-  P = {},
-  B = {},
-  D = {},
-  C extends ComputedOptions = {},
-  M extends MethodOptions = {},
-  Defaults = {},
-> = {
-  P: P
-  B: B
-  D: D
-  C: C
-  M: M
-  Defaults: Defaults
-}
-
 enum OptionTypes {
   PROPS = 'Props',
   DATA = 'Data',
@@ -979,9 +861,7 @@ export function mergeOptions(
     mergeOptions(to, extendsOptions, strats, true)
   }
   if (mixins) {
-    mixins.forEach((m: ComponentOptionsMixin) =>
-      mergeOptions(to, m, strats, true),
-    )
+    mixins.forEach((m: {}) => mergeOptions(to, m, strats, true))
   }
 
   for (const key in from) {
@@ -1120,205 +1000,3 @@ function mergeWatchOptions(
   }
   return merged
 }
-
-// Deprecated legacy types, kept because they were previously exported ---------
-
-/**
- * @deprecated
- */
-export type ComponentOptionsWithoutProps<
-  Props = {},
-  RawBindings = {},
-  D = {},
-  C extends ComputedOptions = {},
-  M extends MethodOptions = {},
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
-  E extends EmitsOptions = {},
-  EE extends string = string,
-  I extends ComponentInjectOptions = {},
-  II extends string = string,
-  S extends SlotsType = {},
-  LC extends Record<string, Component> = {},
-  Directives extends Record<string, Directive> = {},
-  Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  TE extends ComponentTypeEmits = {},
-  ResolvedEmits extends EmitsOptions = {} extends E
-    ? TypeEmitsToOptions<TE>
-    : E,
-  PE = Props & EmitsToProps<ResolvedEmits>,
-> = ComponentOptionsBase<
-  PE,
-  RawBindings,
-  D,
-  C,
-  M,
-  Mixin,
-  Extends,
-  E,
-  EE,
-  {},
-  I,
-  II,
-  S,
-  LC,
-  Directives,
-  Exposed,
-  Provide
-> & {
-  props?: never
-  /**
-   * @private for language-tools use only
-   */
-  __typeProps?: Props
-  /**
-   * @private for language-tools use only
-   */
-  __typeEmits?: TE
-} & ThisType<
-    CreateComponentPublicInstanceWithMixins<
-      PE,
-      RawBindings,
-      D,
-      C,
-      M,
-      Mixin,
-      Extends,
-      ResolvedEmits,
-      EE,
-      {},
-      false,
-      I,
-      S,
-      LC,
-      Directives,
-      Exposed
-    >
-  >
-
-/**
- * @deprecated
- */
-export type ComponentOptionsWithArrayProps<
-  PropNames extends string = string,
-  RawBindings = {},
-  D = {},
-  C extends ComputedOptions = {},
-  M extends MethodOptions = {},
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
-  E extends EmitsOptions = EmitsOptions,
-  EE extends string = string,
-  I extends ComponentInjectOptions = {},
-  II extends string = string,
-  S extends SlotsType = {},
-  LC extends Record<string, Component> = {},
-  Directives extends Record<string, Directive> = {},
-  Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  Props = Prettify<Readonly<{ [key in PropNames]?: any } & EmitsToProps<E>>>,
-> = ComponentOptionsBase<
-  Props,
-  RawBindings,
-  D,
-  C,
-  M,
-  Mixin,
-  Extends,
-  E,
-  EE,
-  {},
-  I,
-  II,
-  S,
-  LC,
-  Directives,
-  Exposed,
-  Provide
-> & {
-  props: PropNames[]
-} & ThisType<
-    CreateComponentPublicInstanceWithMixins<
-      Props,
-      RawBindings,
-      D,
-      C,
-      M,
-      Mixin,
-      Extends,
-      E,
-      Props,
-      {},
-      false,
-      I,
-      S,
-      LC,
-      Directives,
-      Exposed
-    >
-  >
-
-/**
- * @deprecated
- */
-export type ComponentOptionsWithObjectProps<
-  PropsOptions = ComponentObjectPropsOptions,
-  RawBindings = {},
-  D = {},
-  C extends ComputedOptions = {},
-  M extends MethodOptions = {},
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
-  E extends EmitsOptions = EmitsOptions,
-  EE extends string = string,
-  I extends ComponentInjectOptions = {},
-  II extends string = string,
-  S extends SlotsType = {},
-  LC extends Record<string, Component> = {},
-  Directives extends Record<string, Directive> = {},
-  Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  Props = Prettify<
-    Readonly<ExtractPropTypes<PropsOptions>> & Readonly<EmitsToProps<E>>
-  >,
-  Defaults = ExtractDefaultPropTypes<PropsOptions>,
-> = ComponentOptionsBase<
-  Props,
-  RawBindings,
-  D,
-  C,
-  M,
-  Mixin,
-  Extends,
-  E,
-  EE,
-  Defaults,
-  I,
-  II,
-  S,
-  LC,
-  Directives,
-  Exposed,
-  Provide
-> & {
-  props: PropsOptions & ThisType<void>
-} & ThisType<
-    CreateComponentPublicInstanceWithMixins<
-      Props,
-      RawBindings,
-      D,
-      C,
-      M,
-      Mixin,
-      Extends,
-      E,
-      Props,
-      Defaults,
-      false,
-      I,
-      S,
-      LC,
-      Directives
-    >
-  >
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index e9e7770ebd9..53e0c85519c 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -36,15 +36,12 @@ import {
 import {
   type ComponentInjectOptions,
   type ComponentOptionsBase,
-  type ComponentOptionsMixin,
   type ComponentProvideOptions,
   type ComputedOptions,
   type ExtractComputedReturns,
   type InjectToObject,
   type MergedComponentOptionsOverride,
   type MethodOptions,
-  type OptionTypesKeys,
-  type OptionTypesType,
   resolveMergedOptions,
   shouldCacheAccess,
 } from './componentOptions'
@@ -83,131 +80,39 @@ import type { Directive } from './directives'
  */
 export interface ComponentCustomProperties {}
 
-type IsDefaultMixinComponent<T> = T extends ComponentOptionsMixin
-  ? ComponentOptionsMixin extends T
-    ? true
-    : false
-  : false
-
-type MixinToOptionTypes<T> =
-  T extends ComponentOptionsBase<
-    infer P,
-    infer B,
-    infer D,
-    infer C,
-    infer M,
-    infer Mixin,
-    infer Extends,
-    any,
-    any,
-    infer Defaults,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any,
-    any
-  >
-    ? OptionTypesType<P & {}, B & {}, D & {}, C & {}, M & {}, Defaults & {}> &
-        IntersectionMixin<Mixin> &
-        IntersectionMixin<Extends>
+export type ExtractMixinProps<T> = UnionToIntersection<
+  T extends { props?: infer P }
+    ? P extends (infer K extends string)[]
+      ? Record<K, null>
+      : NonNullable<P>
     : never
+>
 
-// ExtractMixin(map type) is used to resolve circularly references
-type ExtractMixin<T> = {
-  Mixin: MixinToOptionTypes<T>
-}[T extends ComponentOptionsMixin ? 'Mixin' : never]
+export type ExtractMixinMethods<T> = UnionToIntersection<
+  T extends { methods?: infer M } ? NonNullable<M> : never
+>
 
-export type IntersectionMixin<T> =
-  IsDefaultMixinComponent<T> extends true
-    ? OptionTypesType
-    : UnionToIntersection<ExtractMixin<T>>
+export type ExtractMixinComputed<T> = UnionToIntersection<
+  T extends { computed?: infer C } ? NonNullable<C> : never
+>
 
-export type UnwrapMixinsType<
-  T,
-  Type extends OptionTypesKeys,
-> = T extends OptionTypesType ? T[Type] : never
-
-type EnsureNonVoid<T> = T extends void ? {} : T
-
-export type ComponentPublicInstanceConstructor<
-  T extends ComponentPublicInstance<
-    Props,
-    RawBindings,
-    D,
-    C,
-    M
-  > = ComponentPublicInstance<any>,
-  Props = any,
-  RawBindings = any,
-  D = any,
-  C extends ComputedOptions = ComputedOptions,
-  M extends MethodOptions = MethodOptions,
-> = {
+export type ExtractMixinData<T> = UnionToIntersection<
+  T extends { data?(): infer P } ? P : never
+>
+
+export type ExtractMixinSetupBindings<T> = UnionToIntersection<
+  T extends { setup?(): infer B } ? B : never
+>
+
+export type EnsureNonVoid<T> = T extends void ? {} : T
+
+export interface ComponentPublicInstanceConstructor<T> {
   __isFragment?: never
   __isTeleport?: never
   __isSuspense?: never
   new (...args: any[]): T
 }
 
-/**
- * @deprecated This is no longer used internally, but exported and relied on by
- * existing library types generated by vue-tsc.
- */
-export type CreateComponentPublicInstance<
-  P = {},
-  B = {},
-  D = {},
-  C extends ComputedOptions = {},
-  M extends MethodOptions = {},
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
-  E extends EmitsOptions = {},
-  PublicProps = P,
-  Defaults = {},
-  MakeDefaultsOptional extends boolean = false,
-  I extends ComponentInjectOptions = {},
-  S extends SlotsType = {},
-  PublicMixin = IntersectionMixin<Mixin> & IntersectionMixin<Extends>,
-  PublicP = UnwrapMixinsType<PublicMixin, 'P'> & EnsureNonVoid<P>,
-  PublicB = UnwrapMixinsType<PublicMixin, 'B'> & EnsureNonVoid<B>,
-  PublicD = UnwrapMixinsType<PublicMixin, 'D'> & EnsureNonVoid<D>,
-  PublicC extends ComputedOptions = UnwrapMixinsType<PublicMixin, 'C'> &
-    EnsureNonVoid<C>,
-  PublicM extends MethodOptions = UnwrapMixinsType<PublicMixin, 'M'> &
-    EnsureNonVoid<M>,
-  PublicDefaults = UnwrapMixinsType<PublicMixin, 'Defaults'> &
-    EnsureNonVoid<Defaults>,
-> = ComponentPublicInstance<
-  PublicP,
-  PublicB,
-  PublicD,
-  PublicC,
-  PublicM,
-  E,
-  PublicProps,
-  PublicDefaults,
-  MakeDefaultsOptional,
-  ComponentOptionsBase<
-    P,
-    B,
-    D,
-    C,
-    M,
-    Mixin,
-    Extends,
-    E,
-    string,
-    Defaults,
-    {},
-    string,
-    S
-  >,
-  I,
-  S
->
-
 /**
  * This is the same as `CreateComponentPublicInstance` but adds local components,
  * global directives, exposed, and provide inference.
@@ -221,8 +126,8 @@ export type CreateComponentPublicInstanceWithMixins<
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
+  Mixin = {},
+  Extends = {},
   E extends EmitsOptions = {},
   PublicProps = P,
   Defaults = {},
@@ -236,16 +141,22 @@ export type CreateComponentPublicInstanceWithMixins<
   TypeEl extends Element = any,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   // mixin inference
-  PublicMixin = IntersectionMixin<Mixin> & IntersectionMixin<Extends>,
-  PublicP = UnwrapMixinsType<PublicMixin, 'P'> & EnsureNonVoid<P>,
-  PublicB = UnwrapMixinsType<PublicMixin, 'B'> & EnsureNonVoid<B>,
-  PublicD = UnwrapMixinsType<PublicMixin, 'D'> & EnsureNonVoid<D>,
-  PublicC extends ComputedOptions = UnwrapMixinsType<PublicMixin, 'C'> &
+  PublicP = ExtractMixinProps<Mixin> &
+    ExtractMixinProps<Extends> &
+    EnsureNonVoid<P>,
+  PublicB = ExtractMixinSetupBindings<Mixin> &
+    ExtractMixinSetupBindings<Extends> &
+    EnsureNonVoid<B>,
+  PublicD = ExtractMixinData<Mixin> &
+    ExtractMixinData<Extends> &
+    EnsureNonVoid<D>,
+  PublicC extends ComputedOptions = ExtractMixinComputed<Mixin> &
+    ExtractMixinComputed<Extends> &
     EnsureNonVoid<C>,
-  PublicM extends MethodOptions = UnwrapMixinsType<PublicMixin, 'M'> &
+  PublicM extends MethodOptions = ExtractMixinMethods<Mixin> &
+    ExtractMixinMethods<Extends> &
     EnsureNonVoid<M>,
-  PublicDefaults = UnwrapMixinsType<PublicMixin, 'Defaults'> &
-    EnsureNonVoid<Defaults>,
+  PublicDefaults = {} & EnsureNonVoid<Defaults>, // TODO
 > = ComponentPublicInstance<
   PublicP,
   PublicB,
@@ -256,25 +167,20 @@ export type CreateComponentPublicInstanceWithMixins<
   PublicProps,
   PublicDefaults,
   MakeDefaultsOptional,
-  ComponentOptionsBase<
-    P,
-    B,
-    D,
-    C,
-    M,
-    Mixin,
-    Extends,
-    E,
-    string,
-    Defaults,
-    {},
-    string,
-    S,
-    LC,
-    Directives,
-    Exposed,
-    Provide
-  >,
+  {
+    computed?: C
+    methods?: M
+    mixins?: Mixin[]
+    extends?: Extends
+    inject?: {}
+    slots?: S
+    components?: LC
+    directives?: Directives
+    expose?: Exposed[]
+    provide?: Provide
+    setup?: () => B
+    data?: () => D
+  } & ComponentOptionsBase,
   I,
   S,
   Exposed,
@@ -299,7 +205,20 @@ export type ComponentPublicInstance<
   PublicProps = {},
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
-  Options = ComponentOptionsBase<any, any, any, any, any, any, any, any, any>,
+  Options = {
+    computed?: any
+    methods?: any
+    mixins?: any
+    extends?: any
+    inject?: any
+    slots?: any
+    components?: any
+    directives?: any
+    expose?: any
+    provide?: any
+    setup?: () => any
+    data?: () => any
+  } & ComponentOptionsBase,
   I extends ComponentInjectOptions = {},
   S extends SlotsType = {},
   Exposed extends string = '',
diff --git a/packages/runtime-core/src/h.ts b/packages/runtime-core/src/h.ts
index 93e7fd9bc88..11e26f8ccd4 100644
--- a/packages/runtime-core/src/h.ts
+++ b/packages/runtime-core/src/h.ts
@@ -150,6 +150,14 @@ export function h<
 // catch-all for generic component types
 export function h(type: Component, children?: RawChildren): VNode
 
+// fake constructor type returned by `defineComponent` or class component
+export function h(type: Constructor, children?: RawChildren): VNode
+export function h<P>(
+  type: Constructor<P>,
+  props?: (RawProps & P) | ({} extends P ? null : never),
+  children?: RawChildren | RawSlots,
+): VNode
+
 // concrete component
 export function h<P>(
   type: ConcreteComponent | string,
@@ -175,14 +183,6 @@ export function h<P>(
   children?: RawChildren | RawSlots,
 ): VNode
 
-// fake constructor type returned by `defineComponent` or class component
-export function h(type: Constructor, children?: RawChildren): VNode
-export function h<P>(
-  type: Constructor<P>,
-  props?: (RawProps & P) | ({} extends P ? null : never),
-  children?: RawChildren | RawSlots,
-): VNode
-
 // fake constructor type returned by `defineComponent`
 export function h(type: DefineComponent, children?: RawChildren): VNode
 export function h<P>(
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 3871167b3ee..9a34f324572 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -274,7 +274,6 @@ export type {
 } from './apiDefineComponent'
 export type {
   ComponentOptions,
-  ComponentOptionsMixin,
   ComponentCustomOptions,
   ComponentOptionsBase,
   ComponentProvideOptions,
@@ -283,10 +282,6 @@ export type {
   ComputedOptions,
   RuntimeCompilerOptions,
   ComponentInjectOptions,
-  // deprecated
-  ComponentOptionsWithoutProps,
-  ComponentOptionsWithArrayProps,
-  ComponentOptionsWithObjectProps,
 } from './componentOptions'
 export type {
   EmitsOptions,
@@ -296,9 +291,9 @@ export type {
   EmitFn,
 } from './componentEmits'
 export type {
+  ExtractMixinProps,
   ComponentPublicInstance,
   ComponentCustomProperties,
-  CreateComponentPublicInstance,
   CreateComponentPublicInstanceWithMixins,
 } from './componentPublicInstance'
 export type {
diff --git a/packages/runtime-dom/__tests__/customElement.spec.ts b/packages/runtime-dom/__tests__/customElement.spec.ts
index df438d47eee..2512563ba92 100644
--- a/packages/runtime-dom/__tests__/customElement.spec.ts
+++ b/packages/runtime-dom/__tests__/customElement.spec.ts
@@ -4,6 +4,7 @@ import {
   type Ref,
   Teleport,
   type VueElement,
+  VueElementConstructor,
   createApp,
   defineAsyncComponent,
   defineComponent,
@@ -863,7 +864,7 @@ describe('defineCustomElement', () => {
     })
 
     test('set DOM property before resolve', async () => {
-      const E = defineCustomElement(
+      const E: VueElementConstructor<any> = defineCustomElement(
         defineAsyncComponent(() => {
           return Promise.resolve({
             props: ['msg'],
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index aeeaeec9b9f..900b7be4acb 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -7,7 +7,6 @@ import {
   type ComponentObjectPropsOptions,
   type ComponentOptions,
   type ComponentOptionsBase,
-  type ComponentOptionsMixin,
   type ComponentProvideOptions,
   type ComponentPublicInstance,
   type ComputedOptions,
@@ -20,11 +19,13 @@ import {
   type EmitsToProps,
   type ExtractPropTypes,
   type MethodOptions,
+  type ObjectEmitsOptions,
   type RenderFunction,
   type SetupContext,
   type SlotsType,
   type VNode,
   type VNodeProps,
+  type ExtractMixinProps,
   createVNode,
   defineComponent,
   getCurrentInstance,
@@ -39,6 +40,8 @@ import {
   hyphenate,
   isArray,
   isPlainObject,
+  LooseRequired,
+  Prettify,
   toNumber,
 } from '@vue/shared'
 import { createApp, createSSRApp, render } from '.'
@@ -63,15 +66,21 @@ export interface CustomElementOptions {
 // overload 1: direct setup function
 export function defineCustomElement<Props, RawBindings = object>(
   setup: (props: Props, ctx: SetupContext) => RawBindings | RenderFunction,
-  options?: Pick<ComponentOptions, 'name' | 'inheritAttrs' | 'emits'> &
-    CustomElementOptions & {
+  options?: {
+    name?: string
+    inheritAttrs?: boolean
+    emits?: EmitsOptions
+  } & CustomElementOptions & {
       props?: (keyof Props)[]
     },
 ): VueElementConstructor<Props>
 export function defineCustomElement<Props, RawBindings = object>(
   setup: (props: Props, ctx: SetupContext) => RawBindings | RenderFunction,
-  options?: Pick<ComponentOptions, 'name' | 'inheritAttrs' | 'emits'> &
-    CustomElementOptions & {
+  options?: {
+    name?: string
+    inheritAttrs?: boolean
+    emits?: EmitsOptions
+  } & CustomElementOptions & {
       props?: ComponentObjectPropsOptions<Props>
     },
 ): VueElementConstructor<Props>
@@ -83,15 +92,15 @@ export function defineCustomElement<
     ComponentObjectPropsOptions = ComponentObjectPropsOptions,
   PropsKeys extends string = string,
   // emits
-  RuntimeEmitsOptions extends EmitsOptions = {},
+  RuntimeEmitsOptions extends ObjectEmitsOptions = {},
   EmitsKeys extends string = string,
   // other options
   Data = {},
   SetupBindings = {},
   Computed extends ComputedOptions = {},
   Methods extends MethodOptions = {},
-  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
+  Mixin = {},
+  Extends = {},
   InjectOptions extends ComponentInjectOptions = {},
   InjectKeys extends string = string,
   Slots extends SlotsType = {},
@@ -100,34 +109,47 @@ export function defineCustomElement<
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   // resolved types
+  ResolvedRuntimeEmitsOptions extends EmitsOptions = string extends EmitsKeys
+    ? RuntimeEmitsOptions
+    : EmitsKeys[],
   InferredProps = string extends PropsKeys
     ? ComponentObjectPropsOptions extends RuntimePropsOptions
       ? {}
       : ExtractPropTypes<RuntimePropsOptions>
     : { [key in PropsKeys]?: any },
   ResolvedProps = InferredProps & EmitsToProps<RuntimeEmitsOptions>,
+  PublicP = ResolvedProps &
+    Prettify<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>,
+  DataVM = CreateComponentPublicInstanceWithMixins<
+    PublicP,
+    {},
+    {},
+    {},
+    MethodOptions,
+    Mixin,
+    Extends
+  >,
 >(
   options: CustomElementOptions & {
     props?: (RuntimePropsOptions & ThisType<void>) | PropsKeys[]
-  } & ComponentOptionsBase<
-      ResolvedProps,
-      SetupBindings,
-      Data,
-      Computed,
-      Methods,
-      Mixin,
-      Extends,
-      RuntimeEmitsOptions,
-      EmitsKeys,
-      {}, // Defaults
-      InjectOptions,
-      InjectKeys,
-      Slots,
-      LocalComponents,
-      Directives,
-      Exposed,
-      Provide
-    > &
+    emits?: (RuntimeEmitsOptions & ThisType<void>) | EmitsKeys[]
+    computed?: Computed
+    methods?: Methods
+    mixins?: Mixin[]
+    extends?: Extends
+    inject?: string extends InjectKeys ? InjectOptions : InjectKeys[]
+    slots?: Slots
+    components?: LocalComponents
+    directives?: Directives
+    expose?: Exposed[]
+    provide?: Provide
+    setup?: (
+      this: void,
+      props: NoInfer<LooseRequired<PublicP>>,
+      ctx: NoInfer<SetupContext<ResolvedRuntimeEmitsOptions, Slots>>,
+    ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
+    data?: (this: DataVM, vm: DataVM) => Data
+  } & ComponentOptionsBase &
     ThisType<
       CreateComponentPublicInstanceWithMixins<
         Readonly<ResolvedProps>,
diff --git a/packages/shared/src/typeUtils.ts b/packages/shared/src/typeUtils.ts
index f5b9e6ec3c8..1fd161ceb05 100644
--- a/packages/shared/src/typeUtils.ts
+++ b/packages/shared/src/typeUtils.ts
@@ -13,12 +13,6 @@ export type LooseRequired<T> = { [P in keyof (T & Required<T>)]: T[P] }
 // https://stackoverflow.com/questions/49927523/disallow-call-with-any/49928360#49928360
 export type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N
 
-export type IsKeyValues<T, K = string> = IfAny<
-  T,
-  false,
-  T extends object ? (keyof T extends K ? true : false) : false
->
-
 /**
  * Utility for extracting the parameters from a function overload (for typed emits)
  * https://github.com/microsoft/TypeScript/issues/32164#issuecomment-1146737709

From cbaf9ae74a4bb65ba08f34fba0446549b83e5448 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 17 Feb 2025 02:14:00 +0800
Subject: [PATCH 002/127] wip [skip ci]

---
 .../runtime-core/__tests__/apiOptions.spec.ts |  10 +-
 .../__tests__/componentEmits.spec.ts          |   2 +-
 .../runtime-core/src/apiDefineComponent.ts    |  60 ++++++++-
 packages/runtime-core/src/apiSetupHelpers.ts  |  14 ++-
 packages/runtime-core/src/componentOptions.ts | 116 ++++++++++--------
 .../src/componentPublicInstance.ts            |  38 +++++-
 packages/runtime-dom/src/apiCustomElement.ts  |  30 +++--
 7 files changed, 198 insertions(+), 72 deletions(-)

diff --git a/packages/runtime-core/__tests__/apiOptions.spec.ts b/packages/runtime-core/__tests__/apiOptions.spec.ts
index ce00acf9e2b..349afda6e1c 100644
--- a/packages/runtime-core/__tests__/apiOptions.spec.ts
+++ b/packages/runtime-core/__tests__/apiOptions.spec.ts
@@ -3,6 +3,7 @@
  */
 import type { Mock } from 'vitest'
 import {
+  type ComponentOptionsBase,
   type TestElement,
   computed,
   createApp,
@@ -1414,8 +1415,9 @@ describe('api: options', () => {
     })
 
     test('computed with setter and no getter', () => {
-      const Comp = {
+      const Comp: ComponentOptionsBase = {
         computed: {
+          // @ts-expect-error
           foo: {
             set() {},
           },
@@ -1430,8 +1432,9 @@ describe('api: options', () => {
 
     test('assigning to computed with no setter', () => {
       let instance: any
-      const Comp = {
+      const Comp: ComponentOptionsBase = {
         computed: {
+          // @ts-expect-error
           foo: {
             get() {},
           },
@@ -1482,8 +1485,9 @@ describe('api: options', () => {
     })
 
     test('methods property is not a function', () => {
-      const Comp = {
+      const Comp: ComponentOptionsBase = {
         methods: {
+          // @ts-expect-error
           foo: 1,
         },
         render() {},
diff --git a/packages/runtime-core/__tests__/componentEmits.spec.ts b/packages/runtime-core/__tests__/componentEmits.spec.ts
index dc82c04919f..8b1ab8a223e 100644
--- a/packages/runtime-core/__tests__/componentEmits.spec.ts
+++ b/packages/runtime-core/__tests__/componentEmits.spec.ts
@@ -586,7 +586,7 @@ describe('component: emit', () => {
         two: twoFn,
         three: null,
       })
-      expect(this.$options.emits.two).toBe(twoFn)
+      expect((this.$options.emits as any).two).toBe(twoFn)
       return h('div')
     })
     const ComponentC = defineComponent({
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index d5ee0a7d572..3376a6b9a6e 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -108,7 +108,24 @@ export type DefineComponent<
   provide?: Provide
   setup?: () => RawBindings
   data?: () => D
-} & ComponentOptionsBase &
+
+  // allow any custom options
+  [key: string]: any
+} & Omit<
+    ComponentOptionsBase,
+    | 'computed'
+    | 'methods'
+    | 'mixins'
+    | 'extends'
+    | 'inject'
+    | 'slots'
+    | 'components'
+    | 'directives'
+    | 'expose'
+    | 'provide'
+    | 'setup'
+    | 'data'
+  > &
   PP
 
 export type DefineSetupFnComponent<
@@ -327,7 +344,26 @@ export function defineComponent<
      * @private for language-tools use only
      */
     __typeEl?: TypeEl
-  } & ComponentOptionsBase &
+
+    // allow any custom options
+    [key: string]: any
+  } & Omit<
+    ComponentOptionsBase,
+    | 'props'
+    | 'emits'
+    | 'components'
+    | 'directives'
+    | 'slots'
+    | 'expose'
+    | 'computed'
+    | 'methods'
+    | 'provide'
+    | 'inject'
+    | 'mixins'
+    | 'extends'
+    | 'setup'
+    | 'data'
+  > &
     ThisType<OptionsVM>,
 ): {
   props?: string extends RuntimePropsKeys
@@ -348,8 +384,24 @@ export function defineComponent<
   extends?: Extends
   setup?(): SetupBindings
   data?(): Data
-} & ComponentOptionsBase &
-  ComponentPublicInstanceConstructor<ReturnVM>
+  new (...args: any[]): ReturnVM
+} & Omit<
+  ComponentOptionsBase,
+  | 'props'
+  | 'emits'
+  | 'components'
+  | 'directives'
+  | 'slots'
+  | 'expose'
+  | 'computed'
+  | 'methods'
+  | 'provide'
+  | 'inject'
+  | 'mixins'
+  | 'extends'
+  | 'setup'
+  | 'data'
+>
 
 // implementation, close to no-op
 /*! #__NO_SIDE_EFFECTS__ */
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 0f3ca2839fa..06d89d4a4f7 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -230,7 +230,19 @@ export function defineOptions<
      * slots should be defined via defineSlots().
      */
     slots?: never
-  } & ComponentOptionsBase,
+  } & Omit<
+    ComponentOptionsBase,
+    | 'computed'
+    | 'methods'
+    | 'mixins'
+    | 'extends'
+    | 'data'
+    | 'setup'
+    | 'props'
+    | 'emits'
+    | 'expose'
+    | 'slots'
+  >,
 ): void {
   if (__DEV__) {
     warnRuntimeUsage(`defineOptions`)
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 6d1afc9fe3d..3d28813d3f0 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -95,24 +95,10 @@ export interface ComponentCustomOptions {}
 export type RenderFunction = () => VNodeChild
 
 export interface ComponentOptionsBase
-  extends ComponentInternalOptions,
+  extends LegacyOptions,
+    ComponentInternalOptions,
     ComponentCustomOptions {
-  components?: Record<string, Component>
-  directives?: Record<string, Directive>
-  slots?: unknown
-  expose?: string[]
-
-  //#region LegacyOptions
-  computed?: unknown // ComputedOptions
-  methods?: unknown // MethodOptions
-  provide?: unknown // ComponentProvideOptions
-  inject?: unknown // ComponentInjectOptions | string[]
-
-  // composition
-  mixins?: unknown
-  extends?: unknown
-  //#endregion
-
+  setup?: (props: any, ctx: SetupContext) => any
   name?: string
   template?: string | object // can be a direct DOM node
   // Note: we are intentionally using the signature-less `Function` type here
@@ -121,7 +107,16 @@ export interface ComponentOptionsBase
   // Luckily `render()` doesn't need any arguments nor does it care about return
   // type.
   render?: Function
+  // NOTE: extending both LC and Record<string, Component> allows objects to be forced
+  // to be of type Component, while still inferring LC generic
+  components?: Record<string, Component>
+  // NOTE: extending both Directives and Record<string, Directive> allows objects to be forced
+  // to be of type Directive, while still inferring Directives generic
+  directives?: Record<string, Directive>
   inheritAttrs?: boolean
+  emits?: EmitsOptions
+  slots?: SlotsType
+  expose?: string[]
   serverPrefetch?(): void | Promise<any>
 
   // Runtime compiler only -----------------------------------------------------
@@ -186,42 +181,7 @@ export interface ComponentOptionsBase
   __isTeleport?: never
   __isSuspense?: never
 
-  //#region LegacyOptions
-  compatConfig?: CompatConfig
-
-  // allow any custom options
-  [key: string]: any
-
-  watch?: ComponentWatchOptions
-
-  // assets
-  filters?: Record<string, Function>
-
-  // lifecycle
-  beforeCreate?(): any
-  created?(): any
-  beforeMount?(): any
-  mounted?(): any
-  beforeUpdate?(): any
-  updated?(): any
-  activated?(): any
-  deactivated?(): any
-  /** @deprecated use `beforeUnmount` instead */
-  beforeDestroy?(): any
-  beforeUnmount?(): any
-  /** @deprecated use `unmounted` instead */
-  destroyed?(): any
-  unmounted?(): any
-  renderTracked?: DebuggerHook
-  renderTriggered?: DebuggerHook
-  errorCaptured?: ErrorCapturedHook
-
-  /**
-   * runtime compile only
-   * @deprecated use `compilerOptions.delimiters` instead.
-   */
-  delimiters?: [string, string]
-  //#endregion
+  __defaults?: any
 }
 
 /**
@@ -281,6 +241,9 @@ export type ComponentOptions<
     ctx: NoInfer<SetupContext<E, S>>,
   ) => Promise<RawBindings> | RawBindings | RenderFunction | void
   data?: (this: DataVM, vm: DataVM) => D
+
+  // allow any custom options
+  [key: string]: any
 } & ComponentOptionsBase &
   ThisType<
     CreateComponentPublicInstanceWithMixins<
@@ -351,6 +314,53 @@ export type InjectToObject<T extends ComponentInjectOptions> =
         }
       : never
 
+interface LegacyOptions {
+  compatConfig?: CompatConfig
+
+  // state
+  // Limitation: we cannot expose RawBindings on the `this` context for data
+  // since that leads to some sort of circular inference and breaks ThisType
+  // for the entire component.
+  data?: (vm: any) => any
+  computed?: ComputedOptions
+  methods?: MethodOptions
+  watch?: ComponentWatchOptions
+  provide?: ComponentProvideOptions
+  inject?: ComponentInjectOptions
+
+  // assets
+  filters?: Record<string, Function>
+
+  // composition
+  mixins?: any[]
+  extends?: any
+
+  // lifecycle
+  beforeCreate?(): any
+  created?(): any
+  beforeMount?(): any
+  mounted?(): any
+  beforeUpdate?(): any
+  updated?(): any
+  activated?(): any
+  deactivated?(): any
+  /** @deprecated use `beforeUnmount` instead */
+  beforeDestroy?(): any
+  beforeUnmount?(): any
+  /** @deprecated use `unmounted` instead */
+  destroyed?(): any
+  unmounted?(): any
+  renderTracked?: DebuggerHook
+  renderTriggered?: DebuggerHook
+  errorCaptured?: ErrorCapturedHook
+
+  /**
+   * runtime compile only
+   * @deprecated use `compilerOptions.delimiters` instead.
+   */
+  delimiters?: [string, string]
+}
+
 type MergedHook<T = () => void> = T | T[]
 
 export type MergedComponentOptions = ComponentOptions &
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 53e0c85519c..b224677aec1 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -180,7 +180,24 @@ export type CreateComponentPublicInstanceWithMixins<
     provide?: Provide
     setup?: () => B
     data?: () => D
-  } & ComponentOptionsBase,
+
+    // allow any custom options
+    [key: string]: any
+  } & Omit<
+    ComponentOptionsBase,
+    | 'computed'
+    | 'methods'
+    | 'mixins'
+    | 'extends'
+    | 'inject'
+    | 'slots'
+    | 'components'
+    | 'directives'
+    | 'expose'
+    | 'provide'
+    | 'setup'
+    | 'data'
+  >,
   I,
   S,
   Exposed,
@@ -218,7 +235,24 @@ export type ComponentPublicInstance<
     provide?: any
     setup?: () => any
     data?: () => any
-  } & ComponentOptionsBase,
+
+    // allow any custom options
+    [key: string]: any
+  } & Omit<
+    ComponentOptionsBase,
+    | 'computed'
+    | 'methods'
+    | 'mixins'
+    | 'extends'
+    | 'inject'
+    | 'slots'
+    | 'components'
+    | 'directives'
+    | 'expose'
+    | 'provide'
+    | 'setup'
+    | 'data'
+  >,
   I extends ComponentInjectOptions = {},
   S extends SlotsType = {},
   Exposed extends string = '',
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index 900b7be4acb..de08c07943f 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -8,12 +8,10 @@ import {
   type ComponentOptions,
   type ComponentOptionsBase,
   type ComponentProvideOptions,
-  type ComponentPublicInstance,
   type ComputedOptions,
   type ConcreteComponent,
   type CreateAppFunction,
   type CreateComponentPublicInstanceWithMixins,
-  type DefineComponent,
   type Directive,
   type EmitsOptions,
   type EmitsToProps,
@@ -149,7 +147,26 @@ export function defineCustomElement<
       ctx: NoInfer<SetupContext<ResolvedRuntimeEmitsOptions, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
     data?: (this: DataVM, vm: DataVM) => Data
-  } & ComponentOptionsBase &
+
+    // allow any custom options
+    [key: string]: any
+  } & Omit<
+      ComponentOptionsBase,
+      | 'props'
+      | 'emits'
+      | 'computed'
+      | 'methods'
+      | 'mixins'
+      | 'extends'
+      | 'inject'
+      | 'slots'
+      | 'components'
+      | 'directives'
+      | 'expose'
+      | 'provide'
+      | 'setup'
+      | 'data'
+    > &
     ThisType<
       CreateComponentPublicInstanceWithMixins<
         Readonly<ResolvedProps>,
@@ -175,14 +192,11 @@ export function defineCustomElement<
 
 // overload 3: defining a custom element from the returned value of
 // `defineComponent`
-export function defineCustomElement<
-  // this should be `ComponentPublicInstanceConstructor` but that type is not exported
-  T extends { new (...args: any[]): ComponentPublicInstance<any> },
->(
+export function defineCustomElement<T extends { props?: any }>(
   options: T,
   extraOptions?: CustomElementOptions,
 ): VueElementConstructor<
-  T extends DefineComponent<infer P, any, any, any> ? P : unknown
+  ExtractPropTypes<T extends { props?: infer P } ? P : never>
 >
 
 /*! #__NO_SIDE_EFFECTS__ */

From be6ad270362945e82f7196a0ca419d1f16bdb494 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 17 Feb 2025 03:36:35 +0800
Subject: [PATCH 003/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    | 60 +++++++++----------
 packages/runtime-core/src/componentOptions.ts |  2 +-
 .../src/componentPublicInstance.ts            |  2 +-
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 3376a6b9a6e..664c1a6b67e 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -15,12 +15,12 @@ import type {
   TypeEmitsToOptions,
 } from './componentEmits'
 import type {
-  ComponentInjectOptions,
   ComponentOptions,
   ComponentOptionsBase,
   ComponentProvideOptions,
   ComputedOptions,
   MethodOptions,
+  ObjectInjectOptions,
   RenderFunction,
 } from './componentOptions'
 import type {
@@ -197,47 +197,37 @@ export function defineComponent<
 
 // overload 2: defineComponent with options object, infer props from options
 export function defineComponent<
-  // type options
+  // input types
   TypeProps,
-  TypeEmits extends ComponentTypeEmits | unknown = unknown,
+  TypeEmits extends ComponentTypeEmits = {},
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-  // props
-  RuntimePropsOptions extends
-    ComponentObjectPropsOptions = ComponentObjectPropsOptions,
   RuntimePropsKeys extends string = string,
-  // emits
-  RuntimeEmitsOptions extends ObjectEmitsOptions = {},
   RuntimeEmitsKeys extends string = string,
-  // other options
+  InjectKeys extends string = string,
+  Exposed extends string = string,
+  RuntimePropsOptions extends ComponentObjectPropsOptions = {},
+  RuntimeEmitsOptions extends ObjectEmitsOptions = {},
+  InjectOptions extends ObjectInjectOptions = {},
   Data = {},
   SetupBindings = {},
   Computed extends ComputedOptions = {},
   Methods extends MethodOptions = {},
   Mixin = {},
   Extends = {},
-  InjectOptions extends ComponentInjectOptions = {},
-  InjectKeys extends string = string,
   Slots extends SlotsType = {},
   LocalComponents extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
-  Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions,
+  Provide extends ComponentProvideOptions = {},
   // resolved types
-  NormalizedEmitsOptions extends EmitsOptions = unknown extends TypeEmits
-    ? string extends RuntimeEmitsKeys
-      ? RuntimeEmitsOptions
-      : RuntimeEmitsKeys[]
-    : TypeEmitsToOptions<
-        TypeEmits extends ComponentTypeEmits ? TypeEmits : never
-      >,
-  InferredProps = unknown extends TypeProps
-    ? string extends RuntimePropsKeys
-      ? ComponentObjectPropsOptions extends RuntimePropsOptions
-        ? {}
-        : ExtractPropTypes<RuntimePropsOptions>
-      : { [key in RuntimePropsKeys]?: any }
-    : TypeProps,
+  NormalizedEmitsOptions extends EmitsOptions = (string extends RuntimeEmitsKeys
+    ? RuntimeEmitsOptions
+    : RuntimeEmitsKeys[]) &
+    TypeEmitsToOptions<TypeEmits>,
+  InferredProps = (string extends RuntimePropsKeys
+    ? ExtractPropTypes<RuntimePropsOptions>
+    : { [key in RuntimePropsKeys]?: any }) &
+    TypeProps,
   ResolvedProps = ToResolvedProps<InferredProps, NormalizedEmitsOptions>,
   // mixin inference
   PublicP = ExtractMixinProps<Mixin> &
@@ -310,7 +300,9 @@ export function defineComponent<
   >,
 >(
   options: {
-    props?: (RuntimePropsOptions & ThisType<void>) | RuntimePropsKeys[]
+    props?:
+      | (ComponentObjectPropsOptions & (RuntimePropsOptions & ThisType<void>))
+      | RuntimePropsKeys[]
     emits?: (RuntimeEmitsOptions & ThisType<void>) | RuntimeEmitsKeys[]
     components?: LocalComponents
     directives?: Directives
@@ -367,11 +359,11 @@ export function defineComponent<
     ThisType<OptionsVM>,
 ): {
   props?: string extends RuntimePropsKeys
-    ? ComponentObjectPropsOptions extends RuntimePropsOptions
-      ? {}
-      : RuntimePropsOptions
+    ? RuntimePropsOptions
     : RuntimePropsKeys[]
-  emits?: NormalizedEmitsOptions
+  emits?: string extends RuntimeEmitsKeys
+    ? RuntimeEmitsOptions
+    : RuntimeEmitsKeys[]
   components?: LocalComponents & GlobalComponents
   directives?: Directives & GlobalDirectives
   slots?: Slots
@@ -384,6 +376,10 @@ export function defineComponent<
   extends?: Extends
   setup?(): SetupBindings
   data?(): Data
+  __typeProps?: TypeProps
+  __typeEmits?: TypeEmits
+  __typeRefs?: TypeRefs
+  __typeEl?: TypeEl
   new (...args: any[]): ReturnVM
 } & Omit<
   ComponentOptionsBase,
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 3d28813d3f0..9b0456216a1 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -298,7 +298,7 @@ type ObjectProvideOptions = Record<string | symbol, unknown>
 
 export type ComponentInjectOptions = string[] | ObjectInjectOptions
 
-type ObjectInjectOptions = Record<
+export type ObjectInjectOptions = Record<
   string | symbol,
   string | symbol | { from?: string | symbol; default?: unknown }
 >
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index b224677aec1..131414f3e94 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -83,7 +83,7 @@ export interface ComponentCustomProperties {}
 export type ExtractMixinProps<T> = UnionToIntersection<
   T extends { props?: infer P }
     ? P extends (infer K extends string)[]
-      ? Record<K, null>
+      ? { [key in K]?: any }
       : NonNullable<P>
     : never
 >

From 8e756fa12996769f02d64361c1bc7459b0b6e88d Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 17 Feb 2025 17:03:15 +0800
Subject: [PATCH 004/127] wip [skip ci]

---
 .../runtime-core/__tests__/apiOptions.spec.ts |  14 +-
 .../runtime-core/src/apiDefineComponent.ts    | 192 ++++++++++--------
 packages/runtime-core/src/componentEmits.ts   |   6 +-
 .../src/componentPublicInstance.ts            |  86 ++------
 4 files changed, 139 insertions(+), 159 deletions(-)

diff --git a/packages/runtime-core/__tests__/apiOptions.spec.ts b/packages/runtime-core/__tests__/apiOptions.spec.ts
index 349afda6e1c..2a1ec704cbf 100644
--- a/packages/runtime-core/__tests__/apiOptions.spec.ts
+++ b/packages/runtime-core/__tests__/apiOptions.spec.ts
@@ -84,13 +84,6 @@ describe('api: options', () => {
 
   test('methods', async () => {
     const Comp = defineComponent({
-      data() {
-        // #3300 method on ctx should be overwritable
-        this.incBy = this.incBy.bind(this, 2)
-        return {
-          foo: 1,
-        }
-      },
       methods: {
         inc() {
           this.foo++
@@ -99,6 +92,13 @@ describe('api: options', () => {
           this.foo += n
         },
       },
+      data() {
+        // #3300 method on ctx should be overwritable
+        this.incBy = this.incBy.bind(this, 2)
+        return {
+          foo: 1,
+        }
+      },
       render() {
         return h(
           'div',
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 664c1a6b67e..eaba9aa5ffb 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -9,7 +9,6 @@ import type {
   SetupContext,
 } from './component'
 import type {
-  EmitsOptions,
   EmitsToProps,
   ObjectEmitsOptions,
   TypeEmitsToOptions,
@@ -30,11 +29,13 @@ import type {
   ExtractPropTypes,
 } from './componentProps'
 import type {
+  ComponentPublicInstance,
   ComponentPublicInstanceConstructor,
   CreateComponentPublicInstanceWithMixins,
   EnsureNonVoid,
   ExtractMixinComputed,
   ExtractMixinData,
+  ExtractMixinEmits,
   ExtractMixinMethods,
   ExtractMixinProps,
   ExtractMixinSetupBindings,
@@ -152,9 +153,6 @@ export type DefineSetupFnComponent<
   S
 >
 
-type ToResolvedProps<Props, Emits extends EmitsOptions> = Readonly<Props> &
-  Readonly<EmitsToProps<Emits>>
-
 // defineComponent is a utility that is primarily used for type inference
 // when declaring components. Type inference is provided in the component
 // options (provided as the argument). The returned value has artificial types
@@ -197,17 +195,18 @@ export function defineComponent<
 
 // overload 2: defineComponent with options object, infer props from options
 export function defineComponent<
-  // input types
+  // input inference
   TypeProps,
-  TypeEmits extends ComponentTypeEmits = {},
+  TypeEmits extends ComponentTypeEmits | unknown = unknown,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
   RuntimePropsKeys extends string = string,
   RuntimeEmitsKeys extends string = string,
   InjectKeys extends string = string,
   Exposed extends string = string,
-  RuntimePropsOptions extends ComponentObjectPropsOptions = {},
-  RuntimeEmitsOptions extends ObjectEmitsOptions = {},
+  RuntimePropsOptions extends
+    ComponentObjectPropsOptions = ComponentObjectPropsOptions,
+  RuntimeEmitsOptions extends ObjectEmitsOptions = ObjectEmitsOptions,
   InjectOptions extends ObjectInjectOptions = {},
   Data = {},
   SetupBindings = {},
@@ -219,90 +218,106 @@ export function defineComponent<
   LocalComponents extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Provide extends ComponentProvideOptions = {},
-  // resolved types
-  NormalizedEmitsOptions extends EmitsOptions = (string extends RuntimeEmitsKeys
-    ? RuntimeEmitsOptions
-    : RuntimeEmitsKeys[]) &
-    TypeEmitsToOptions<TypeEmits>,
-  InferredProps = (string extends RuntimePropsKeys
-    ? ExtractPropTypes<RuntimePropsOptions>
-    : { [key in RuntimePropsKeys]?: any }) &
-    TypeProps,
-  ResolvedProps = ToResolvedProps<InferredProps, NormalizedEmitsOptions>,
+  // normalized types
+  NormalizedPropsOptions = unknown extends TypeProps
+    ? string extends RuntimePropsKeys
+      ? ComponentObjectPropsOptions extends RuntimePropsOptions
+        ? {}
+        : RuntimePropsOptions
+      : { [K in RuntimePropsKeys]: null }
+    : {},
+  NormalizedEmitsOptions extends ObjectEmitsOptions = unknown extends TypeEmits
+    ? string extends RuntimeEmitsKeys
+      ? RuntimeEmitsOptions
+      : { [K in RuntimeEmitsKeys]: (...args: any) => any }
+    : {},
+  NormalizedInjectOptions extends
+    ObjectInjectOptions = string extends InjectKeys
+    ? InjectOptions
+    : { [K in InjectKeys]: any },
   // mixin inference
-  PublicP = ExtractMixinProps<Mixin> &
-    ExtractMixinProps<Extends> &
-    EnsureNonVoid<ResolvedProps>,
-  PublicB = ExtractMixinSetupBindings<Mixin> &
-    ExtractMixinSetupBindings<Extends> &
-    EnsureNonVoid<SetupBindings>,
-  PublicD = ExtractMixinData<Mixin> &
-    ExtractMixinData<Extends> &
-    EnsureNonVoid<Data>,
-  PublicC extends ComputedOptions = ExtractMixinComputed<Mixin> &
-    ExtractMixinComputed<Extends> &
-    EnsureNonVoid<Computed>,
-  PublicM extends MethodOptions = ExtractMixinMethods<Mixin> &
-    ExtractMixinMethods<Extends> &
-    EnsureNonVoid<Methods>,
-  PublicDefaults = {}, // TODO
-  // vm
-  DataVM = CreateComponentPublicInstanceWithMixins<
-    ResolvedProps,
-    SetupBindings,
-    {}, // Data
-    {}, // Computed
-    MethodOptions,
-    Mixin,
-    Extends,
-    NormalizedEmitsOptions
-  >,
-  OptionsVM = CreateComponentPublicInstanceWithMixins<
-    ResolvedProps,
-    SetupBindings,
-    Data,
-    Computed,
-    Methods,
-    Mixin,
-    Extends,
+  MixinProps = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>,
+  MixinEmits = ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends>,
+  MixinBindings = ExtractMixinSetupBindings<Mixin> &
+    ExtractMixinSetupBindings<Extends>,
+  MixinData = ExtractMixinData<Mixin> & ExtractMixinData<Extends>,
+  MixinComputeds extends ComputedOptions = ExtractMixinComputed<Mixin> &
+    ExtractMixinComputed<Extends> & {},
+  MixinMethods = ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends>,
+  MixinDefaults = {}, // TODO
+  // merged types
+  CompleteProps = MixinProps & NormalizedPropsOptions,
+  CompleteBindings = MixinBindings & SetupBindings,
+  CompleteData = MixinData & EnsureNonVoid<Data>,
+  CompleteComputed extends ComputedOptions = MixinComputeds & Computed,
+  CompleteMethods extends MethodOptions = MixinMethods & Methods,
+  CompleteEmits_Internal extends ObjectEmitsOptions = MixinEmits &
     NormalizedEmitsOptions,
+  CompleteEmits_Public extends ObjectEmitsOptions = MixinEmits &
+    (ObjectEmitsOptions extends NormalizedEmitsOptions
+      ? {}
+      : NormalizedEmitsOptions),
+  // resolved types
+  EmitsOptionsByType = TypeEmitsToOptions<TypeEmits & {}>,
+  ResolvedEmitsOptions_Internal extends
+    ObjectEmitsOptions = CompleteEmits_Internal & EmitsOptionsByType,
+  ResolvedEmitsOptions_Public extends
+    ObjectEmitsOptions = CompleteEmits_Public & EmitsOptionsByType,
+  InferredProps = ExtractPropTypes<CompleteProps> & TypeProps,
+  InferredProps_Internal = Readonly<
+    InferredProps &
+      EmitsToProps<CompleteEmits_Internal & ResolvedEmitsOptions_Internal>
+  >,
+  InferredProps_Public = Readonly<
+    InferredProps &
+      EmitsToProps<CompleteEmits_Public & ResolvedEmitsOptions_Public>
+  >,
+  // instance types
+  DataInstance = ComponentPublicInstance<
+    InferredProps_Internal,
+    CompleteBindings,
+    MixinData,
+    MixinComputeds,
+    CompleteMethods,
+    ResolvedEmitsOptions_Internal
+  >,
+  OptionsInstance = ComponentPublicInstance<
+    InferredProps_Internal,
+    CompleteBindings,
+    CompleteData,
+    CompleteComputed,
+    CompleteMethods,
+    ResolvedEmitsOptions_Internal,
     {}, // PublicProps
     {}, // Defaults
     false,
-    InjectOptions,
+    NormalizedInjectOptions,
     Slots,
-    LocalComponents,
-    Directives,
-    Exposed
+    Exposed,
+    TypeRefs,
+    TypeEl
   >,
-  ReturnVM = CreateComponentPublicInstanceWithMixins<
-    ResolvedProps,
-    SetupBindings,
-    Data,
-    Computed,
-    Methods,
-    Mixin,
-    Extends,
-    NormalizedEmitsOptions,
+  ReturnInstance = ComponentPublicInstance<
+    InferredProps_Public,
+    CompleteBindings,
+    CompleteData,
+    CompleteComputed,
+    CompleteMethods,
+    CompleteEmits_Public,
     PublicProps,
-    ExtractDefaultPropTypes<RuntimePropsOptions>,
+    ExtractDefaultPropTypes<NormalizedPropsOptions>,
     // MakeDefaultsOptional - if TypeProps is provided, set to false to use
     // user props types verbatim
     unknown extends TypeProps ? true : false,
     {}, // InjectOptions
     Slots,
-    LocalComponents & GlobalComponents,
-    Directives & GlobalDirectives,
     Exposed,
     TypeRefs,
-    TypeEl,
-    Provide
+    TypeEl
   >,
 >(
   options: {
-    props?:
-      | (ComponentObjectPropsOptions & (RuntimePropsOptions & ThisType<void>))
-      | RuntimePropsKeys[]
+    props?: (RuntimePropsOptions & ThisType<void>) | RuntimePropsKeys[]
     emits?: (RuntimeEmitsOptions & ThisType<void>) | RuntimeEmitsKeys[]
     components?: LocalComponents
     directives?: Directives
@@ -316,10 +331,10 @@ export function defineComponent<
     extends?: Extends
     setup?: (
       this: void,
-      props: LooseRequired<PublicP>,
+      props: LooseRequired<InferredProps_Internal>,
       ctx: SetupContext<NormalizedEmitsOptions, Slots>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
-    data?: (this: DataVM, vm: DataVM) => Data
+    data?: (this: DataInstance, vm: DataInstance) => Data
     /**
      * @private for language-tools use only
      */
@@ -356,13 +371,21 @@ export function defineComponent<
     | 'setup'
     | 'data'
   > &
-    ThisType<OptionsVM>,
+    ThisType<
+      Omit<OptionsInstance, '$options'> & {
+        $options: typeof options
+      }
+    >,
 ): {
   props?: string extends RuntimePropsKeys
-    ? RuntimePropsOptions
+    ? ComponentObjectPropsOptions extends RuntimePropsOptions
+      ? {}
+      : RuntimePropsOptions
     : RuntimePropsKeys[]
   emits?: string extends RuntimeEmitsKeys
-    ? RuntimeEmitsOptions
+    ? ObjectEmitsOptions extends RuntimeEmitsOptions
+      ? {}
+      : RuntimeEmitsOptions
     : RuntimeEmitsKeys[]
   components?: LocalComponents & GlobalComponents
   directives?: Directives & GlobalDirectives
@@ -380,7 +403,16 @@ export function defineComponent<
   __typeEmits?: TypeEmits
   __typeRefs?: TypeRefs
   __typeEl?: TypeEl
-  new (...args: any[]): ReturnVM
+  /**
+   * #3468
+   *
+   * type-only, used to assist Mixin's type inference,
+   * typescript will try to simplify the inferred `Mixin` type,
+   * with the `__differentiator`, typescript won't be able to combine different mixins,
+   * because the `__differentiator` will be different
+   */
+  __differentiator?: keyof Data | keyof Computed | keyof Methods
+  new (...args: any[]): ReturnInstance
 } & Omit<
   ComponentOptionsBase,
   | 'props'
diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
index db52bc88c33..bc040815f68 100644
--- a/packages/runtime-core/src/componentEmits.ts
+++ b/packages/runtime-core/src/componentEmits.ts
@@ -83,6 +83,8 @@ type IsStringLiteral<T> = T extends string
     : true
   : false
 
+type IsNever<T> = [T] extends [never] ? true : false
+
 export type ShortEmitsToObject<E> =
   E extends Record<string, any[]>
     ? {
@@ -96,8 +98,8 @@ export type EmitFn<
 > =
   Options extends Array<infer V>
     ? (event: V, ...args: any[]) => void
-    : {} extends Options // if the emit is empty object (usually the default value for emit) should be converted to function
-      ? (event: string, ...args: any[]) => void
+    : IsNever<Event> extends true
+      ? {}
       : UnionToIntersection<
           {
             [key in Event]: Options[key] extends (...args: infer Args) => any
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 131414f3e94..e15b290ea5d 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -83,25 +83,33 @@ export interface ComponentCustomProperties {}
 export type ExtractMixinProps<T> = UnionToIntersection<
   T extends { props?: infer P }
     ? P extends (infer K extends string)[]
-      ? { [key in K]?: any }
+      ? { [key in K]: null }
       : NonNullable<P>
-    : never
+    : {}
+>
+
+export type ExtractMixinEmits<T> = UnionToIntersection<
+  T extends { emits?: infer E }
+    ? E extends (infer K extends string)[]
+      ? { [key in K]: (...args: any) => any }
+      : NonNullable<E>
+    : {}
 >
 
 export type ExtractMixinMethods<T> = UnionToIntersection<
-  T extends { methods?: infer M } ? NonNullable<M> : never
+  T extends { methods?: infer M } ? NonNullable<M> : {}
 >
 
 export type ExtractMixinComputed<T> = UnionToIntersection<
-  T extends { computed?: infer C } ? NonNullable<C> : never
+  T extends { computed?: infer C } ? NonNullable<C> : {}
 >
 
 export type ExtractMixinData<T> = UnionToIntersection<
-  T extends { data?(): infer P } ? P : never
+  T extends { data?(): infer P } ? P : {}
 >
 
 export type ExtractMixinSetupBindings<T> = UnionToIntersection<
-  T extends { setup?(): infer B } ? B : never
+  T extends { setup?(): infer B } ? B : {}
 >
 
 export type EnsureNonVoid<T> = T extends void ? {} : T
@@ -167,37 +175,6 @@ export type CreateComponentPublicInstanceWithMixins<
   PublicProps,
   PublicDefaults,
   MakeDefaultsOptional,
-  {
-    computed?: C
-    methods?: M
-    mixins?: Mixin[]
-    extends?: Extends
-    inject?: {}
-    slots?: S
-    components?: LC
-    directives?: Directives
-    expose?: Exposed[]
-    provide?: Provide
-    setup?: () => B
-    data?: () => D
-
-    // allow any custom options
-    [key: string]: any
-  } & Omit<
-    ComponentOptionsBase,
-    | 'computed'
-    | 'methods'
-    | 'mixins'
-    | 'extends'
-    | 'inject'
-    | 'slots'
-    | 'components'
-    | 'directives'
-    | 'expose'
-    | 'provide'
-    | 'setup'
-    | 'data'
-  >,
   I,
   S,
   Exposed,
@@ -218,41 +195,10 @@ export type ComponentPublicInstance<
   D = {}, // return from data()
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   PublicProps = {},
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
-  Options = {
-    computed?: any
-    methods?: any
-    mixins?: any
-    extends?: any
-    inject?: any
-    slots?: any
-    components?: any
-    directives?: any
-    expose?: any
-    provide?: any
-    setup?: () => any
-    data?: () => any
-
-    // allow any custom options
-    [key: string]: any
-  } & Omit<
-    ComponentOptionsBase,
-    | 'computed'
-    | 'methods'
-    | 'mixins'
-    | 'extends'
-    | 'inject'
-    | 'slots'
-    | 'components'
-    | 'directives'
-    | 'expose'
-    | 'provide'
-    | 'setup'
-    | 'data'
-  >,
   I extends ComponentInjectOptions = {},
   S extends SlotsType = {},
   Exposed extends string = '',
@@ -272,7 +218,7 @@ export type ComponentPublicInstance<
   $host: Element | null
   $emit: EmitFn<E>
   $el: TypeEl
-  $options: Options & MergedComponentOptionsOverride
+  $options: ComponentOptionsBase & MergedComponentOptionsOverride
   $forceUpdate: () => void
   $nextTick: typeof nextTick
   $watch<T extends string | ((...args: any) => any)>(

From 5e9fbd1ec0f6d3ae0bef190b03a0ccc54ba07201 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 12:04:19 +0800
Subject: [PATCH 005/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index eaba9aa5ffb..a5ff4c491e3 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -297,13 +297,13 @@ export function defineComponent<
     TypeRefs,
     TypeEl
   >,
-  ReturnInstance = ComponentPublicInstance<
+  PublicInstance = ComponentPublicInstance<
     InferredProps_Public,
     CompleteBindings,
     CompleteData,
     CompleteComputed,
     CompleteMethods,
-    CompleteEmits_Public,
+    ResolvedEmitsOptions_Public,
     PublicProps,
     ExtractDefaultPropTypes<NormalizedPropsOptions>,
     // MakeDefaultsOptional - if TypeProps is provided, set to false to use
@@ -412,7 +412,7 @@ export function defineComponent<
    * because the `__differentiator` will be different
    */
   __differentiator?: keyof Data | keyof Computed | keyof Methods
-  new (...args: any[]): ReturnInstance
+  new (...args: any[]): PublicInstance
 } & Omit<
   ComponentOptionsBase,
   | 'props'

From 2dcae8aa57e6842afce213a306ddb698ffa98533 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 12:12:23 +0800
Subject: [PATCH 006/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index a5ff4c491e3..a929e7bb338 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -387,8 +387,8 @@ export function defineComponent<
       ? {}
       : RuntimeEmitsOptions
     : RuntimeEmitsKeys[]
-  components?: LocalComponents & GlobalComponents
-  directives?: Directives & GlobalDirectives
+  components?: LocalComponents
+  directives?: Directives
   slots?: Slots
   expose?: Exposed[]
   computed?: Computed

From 0e0630b296026acd09eb666bd11c415033144f03 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 12:20:25 +0800
Subject: [PATCH 007/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index a929e7bb338..43097b2aef6 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -281,7 +281,7 @@ export function defineComponent<
     CompleteMethods,
     ResolvedEmitsOptions_Internal
   >,
-  OptionsInstance = ComponentPublicInstance<
+  InternalInstance = ComponentPublicInstance<
     InferredProps_Internal,
     CompleteBindings,
     CompleteData,
@@ -372,7 +372,7 @@ export function defineComponent<
     | 'data'
   > &
     ThisType<
-      Omit<OptionsInstance, '$options'> & {
+      Omit<InternalInstance, '$options'> & {
         $options: typeof options
       }
     >,

From 5730a633f7a489a569080e71968fea6ff5a96490 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 12:25:34 +0800
Subject: [PATCH 008/127] wip [skip ci]

---
 packages/runtime-core/src/componentPublicInstance.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index e15b290ea5d..543a3269811 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -218,7 +218,11 @@ export type ComponentPublicInstance<
   $host: Element | null
   $emit: EmitFn<E>
   $el: TypeEl
-  $options: ComponentOptionsBase & MergedComponentOptionsOverride
+  $options: ComponentOptionsBase &
+    MergedComponentOptionsOverride & {
+      // allow any custom options
+      [key: string]: any
+    }
   $forceUpdate: () => void
   $nextTick: typeof nextTick
   $watch<T extends string | ((...args: any) => any)>(

From 400c45c163f54d8e60e2ebc0e7c7e184cdeae7d4 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 13:29:00 +0800
Subject: [PATCH 009/127] wip [skip ci]

---
 .../dts-test/functionalComponent.test-d.tsx   |  6 ++--
 packages/runtime-core/src/compat/instance.ts  |  9 +++++-
 packages/runtime-core/src/component.ts        |  6 ++--
 .../src/componentPublicInstance.ts            |  2 +-
 packages/runtime-core/src/h.ts                | 32 +++++++------------
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/packages-private/dts-test/functionalComponent.test-d.tsx b/packages-private/dts-test/functionalComponent.test-d.tsx
index 04eda68b50a..253f1d79a84 100644
--- a/packages-private/dts-test/functionalComponent.test-d.tsx
+++ b/packages-private/dts-test/functionalComponent.test-d.tsx
@@ -59,14 +59,14 @@ expectType<JSX.Element>(<Bar foo={1} onUpdate={() => {}} />)
 //  @ts-expect-error
 ;<Foo baz="bar" />
 
-const Baz: FunctionalComponent<{}, string[]> = (props, { emit }) => {
+const Baz: FunctionalComponent = (props, { emit }) => {
   expectType<{}>(props)
   expectType<(event: string) => void>(emit)
 }
 
 expectType<Component>(Baz)
 
-const Qux: FunctionalComponent<{}, ['foo', 'bar']> = (props, { emit }) => {
+const Qux: FunctionalComponent<{}, ('foo' | 'bar')[]> = (props, { emit }) => {
   emit('foo')
   emit('foo', 1, 2)
   emit('bar')
@@ -77,7 +77,7 @@ expectType<Component>(Qux)
 
 const Quux: FunctionalComponent<
   {},
-  {},
+  string[],
   {
     default: { foo: number }
     optional?: { foo: number }
diff --git a/packages/runtime-core/src/compat/instance.ts b/packages/runtime-core/src/compat/instance.ts
index c650113f8ec..45c22ed47f7 100644
--- a/packages/runtime-core/src/compat/instance.ts
+++ b/packages/runtime-core/src/compat/instance.ts
@@ -39,7 +39,14 @@ import { resolveFilter } from '../helpers/resolveAssets'
 import type { Slots } from '../componentSlots'
 import { resolveMergedOptions } from '../componentOptions'
 
-export type LegacyPublicInstance = ComponentPublicInstance &
+export type LegacyPublicInstance = ComponentPublicInstance<
+  {},
+  {},
+  {},
+  {},
+  {},
+  string[]
+> &
   LegacyPublicProperties
 
 export interface LegacyPublicProperties {
diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index 3ed42ed0b55..9e3240e4510 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -214,7 +214,7 @@ export interface ComponentInternalOptions {
 
 export interface FunctionalComponent<
   P = {},
-  E extends EmitsOptions | Record<string, any[]> = {},
+  E extends EmitsOptions | Record<string, any[]> = string[],
   S extends Record<string, any> = any,
   EE extends EmitsOptions = ShortEmitsToObject<E>,
 > extends ComponentInternalOptions {
@@ -248,7 +248,7 @@ export type ConcreteComponent<
   D = any,
   C extends ComputedOptions = ComputedOptions,
   M extends MethodOptions = MethodOptions,
-  E extends EmitsOptions | Record<string, any[]> = {},
+  E extends EmitsOptions | Record<string, any[]> = string[],
   S extends Record<string, any> = any,
 > =
   | ComponentOptions<Props, RawBindings, D, C, M>
@@ -264,7 +264,7 @@ export type Component<
   D = any,
   C extends ComputedOptions = ComputedOptions,
   M extends MethodOptions = MethodOptions,
-  E extends EmitsOptions | Record<string, any[]> = {},
+  E extends EmitsOptions | Record<string, any[]> = string[],
   S extends Record<string, any> = any,
 > =
   | ConcreteComponent<Props, RawBindings, D, C, M, E, S>
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 543a3269811..e6c99654279 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -195,7 +195,7 @@ export type ComponentPublicInstance<
   D = {}, // return from data()
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  E extends EmitsOptions = string[],
+  E extends EmitsOptions = {},
   PublicProps = {},
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
diff --git a/packages/runtime-core/src/h.ts b/packages/runtime-core/src/h.ts
index 11e26f8ccd4..832de9caddf 100644
--- a/packages/runtime-core/src/h.ts
+++ b/packages/runtime-core/src/h.ts
@@ -14,7 +14,6 @@ import { type IfAny, isArray, isObject } from '@vue/shared'
 import type { RawSlots } from './componentSlots'
 import type {
   Component,
-  ComponentOptions,
   ConcreteComponent,
   FunctionalComponent,
 } from './component'
@@ -85,12 +84,12 @@ type HTMLElementEventHandler = {
 // manually written render functions.
 
 // element
-export function h<K extends keyof HTMLElementTagNameMap>(
-  type: K,
+export function h(
+  type: keyof HTMLElementTagNameMap,
   children?: RawChildren,
 ): VNode
-export function h<K extends keyof HTMLElementTagNameMap>(
-  type: K,
+export function h(
+  type: keyof HTMLElementTagNameMap,
   props?: (RawProps & HTMLElementEventHandler) | null,
   children?: RawChildren | RawSlots,
 ): VNode
@@ -143,8 +142,8 @@ export function h<
   S extends Record<string, any> = any,
 >(
   type: FunctionalComponent<P, any, S, any>,
-  props?: (RawProps & P) | ({} extends P ? null : never),
-  children?: RawChildren | IfAny<S, RawSlots, S>,
+  props?: NoInfer<(RawProps & P) | ({} extends P ? null : never)>,
+  children?: NoInfer<RawChildren | IfAny<S, RawSlots, S>>,
 ): VNode
 
 // catch-all for generic component types
@@ -154,32 +153,25 @@ export function h(type: Component, children?: RawChildren): VNode
 export function h(type: Constructor, children?: RawChildren): VNode
 export function h<P>(
   type: Constructor<P>,
-  props?: (RawProps & P) | ({} extends P ? null : never),
+  props?: NoInfer<(RawProps & P) | ({} extends P ? null : never)>,
   children?: RawChildren | RawSlots,
 ): VNode
 
 // concrete component
-export function h<P>(
+export function h(
   type: ConcreteComponent | string,
   children?: RawChildren,
 ): VNode
 export function h<P>(
   type: ConcreteComponent<P> | string,
-  props?: (RawProps & P) | ({} extends P ? null : never),
+  props?: NoInfer<(RawProps & P) | ({} extends P ? null : never)>,
   children?: RawChildren,
 ): VNode
 
 // component without props
 export function h<P>(
   type: Component<P>,
-  props?: (RawProps & P) | null,
-  children?: RawChildren | RawSlots,
-): VNode
-
-// exclude `defineComponent` constructors
-export function h<P>(
-  type: ComponentOptions<P>,
-  props?: (RawProps & P) | ({} extends P ? null : never),
+  props?: NoInfer<(RawProps & P) | null>,
   children?: RawChildren | RawSlots,
 ): VNode
 
@@ -187,7 +179,7 @@ export function h<P>(
 export function h(type: DefineComponent, children?: RawChildren): VNode
 export function h<P>(
   type: DefineComponent<P>,
-  props?: (RawProps & P) | ({} extends P ? null : never),
+  props?: NoInfer<(RawProps & P) | ({} extends P ? null : never)>,
   children?: RawChildren | RawSlots,
 ): VNode
 
@@ -195,7 +187,7 @@ export function h<P>(
 export function h(type: string | Component, children?: RawChildren): VNode
 export function h<P>(
   type: string | Component<P>,
-  props?: (RawProps & P) | ({} extends P ? null : never),
+  props?: NoInfer<(RawProps & P) | ({} extends P ? null : never)>,
   children?: RawChildren | RawSlots,
 ): VNode
 

From bc66f4311646f60cae78ed35b8c4e4bf187e6823 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 13:38:21 +0800
Subject: [PATCH 010/127] wip [skip ci]

---
 packages/runtime-dom/src/apiCustomElement.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index de08c07943f..8987dc1744e 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -192,12 +192,10 @@ export function defineCustomElement<
 
 // overload 3: defining a custom element from the returned value of
 // `defineComponent`
-export function defineCustomElement<T extends { props?: any }>(
-  options: T,
+export function defineCustomElement<P>(
+  options: { props?: P },
   extraOptions?: CustomElementOptions,
-): VueElementConstructor<
-  ExtractPropTypes<T extends { props?: infer P } ? P : never>
->
+): VueElementConstructor<ExtractPropTypes<P>>
 
 /*! #__NO_SIDE_EFFECTS__ */
 export function defineCustomElement(

From 47db864d13eb77ee3bc62b3f8d10550b40fdabd9 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 13:44:24 +0800
Subject: [PATCH 011/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 43097b2aef6..3d1ea783719 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -226,6 +226,11 @@ export function defineComponent<
         : RuntimePropsOptions
       : { [K in RuntimePropsKeys]: null }
     : {},
+  RuntimePropsOptionsDefaults = ExtractDefaultPropTypes<
+    ComponentObjectPropsOptions extends RuntimePropsOptions
+      ? {}
+      : RuntimePropsOptions
+  >,
   NormalizedEmitsOptions extends ObjectEmitsOptions = unknown extends TypeEmits
     ? string extends RuntimeEmitsKeys
       ? RuntimeEmitsOptions
@@ -305,7 +310,7 @@ export function defineComponent<
     CompleteMethods,
     ResolvedEmitsOptions_Public,
     PublicProps,
-    ExtractDefaultPropTypes<NormalizedPropsOptions>,
+    RuntimePropsOptionsDefaults,
     // MakeDefaultsOptional - if TypeProps is provided, set to false to use
     // user props types verbatim
     unknown extends TypeProps ? true : false,

From d585eb3fc9f1502fd9483f1b6195519d4f243821 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 13:48:18 +0800
Subject: [PATCH 012/127] wip [skip ci]

---
 packages-private/dts-test/defineComponent.test-d.tsx | 3 +--
 packages/runtime-core/src/apiDefineComponent.ts      | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 75bbcd09d92..72a82017e45 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1644,7 +1644,6 @@ import type {
   ComponentOptionsMixin,
   DefineComponent,
   Directive,
-  EmitsOptions,
   ExtractPropTypes,
   KeepAliveProps,
   TransitionProps,
@@ -1662,7 +1661,7 @@ declare const MyButton: DefineComponent<
   {},
   ComponentOptionsMixin,
   ComponentOptionsMixin,
-  EmitsOptions,
+  {},
   VNodeProps & AllowedComponentProps & ComponentCustomProps,
   Readonly<ExtractPropTypes<{}>>,
   {},
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 3d1ea783719..23454ade509 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -216,7 +216,7 @@ export function defineComponent<
   Extends = {},
   Slots extends SlotsType = {},
   LocalComponents extends Record<string, Component> = {},
-  Directives extends Record<string, Directive> = {},
+  Directives extends Record<string, Directive> = Record<string, Directive>,
   Provide extends ComponentProvideOptions = {},
   // normalized types
   NormalizedPropsOptions = unknown extends TypeProps
@@ -240,6 +240,9 @@ export function defineComponent<
     ObjectInjectOptions = string extends InjectKeys
     ? InjectOptions
     : { [K in InjectKeys]: any },
+  NormalizedDirectives = Record<string, Directive> extends Directives
+    ? {}
+    : Directives,
   // mixin inference
   MixinProps = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>,
   MixinEmits = ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends>,
@@ -393,7 +396,7 @@ export function defineComponent<
       : RuntimeEmitsOptions
     : RuntimeEmitsKeys[]
   components?: LocalComponents
-  directives?: Directives
+  directives?: Record<string, Directive> extends Directives ? {} : Directives
   slots?: Slots
   expose?: Exposed[]
   computed?: Computed

From af21d7aee9261e6743f7ead0b756b993ae295361 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 14:51:37 +0800
Subject: [PATCH 013/127] wip [skip ci]

---
 .../__tests__/componentProps.spec.ts          | 40 ++++++++++++-
 packages/runtime-core/src/component.ts        |  4 +-
 packages/runtime-core/src/h.ts                | 58 ++++++++++---------
 packages/runtime-core/src/vnode.ts            |  2 +-
 4 files changed, 72 insertions(+), 32 deletions(-)

diff --git a/packages/runtime-core/__tests__/componentProps.spec.ts b/packages/runtime-core/__tests__/componentProps.spec.ts
index b8eb0e47208..547854d3851 100644
--- a/packages/runtime-core/__tests__/componentProps.spec.ts
+++ b/packages/runtime-core/__tests__/componentProps.spec.ts
@@ -152,8 +152,11 @@ describe('component props', () => {
     render(
       h(Comp, {
         // absent should cast to false
+        // @ts-expect-error
         bar: '', // empty string should cast to true
+        // @ts-expect-error
         baz: 'baz', // same string should cast to true
+        // @ts-expect-error
         qux: 'ok', // other values should be left in-tact (but raise warning)
       }),
       nodeOps.createElement('div'),
@@ -206,17 +209,42 @@ describe('component props', () => {
     expect(proxy.bar).toBe(prevBar)
     expect(defaultFn).toHaveBeenCalledTimes(1)
 
-    render(h(Comp, { bar: { b: 2 } }), root)
+    render(
+      h(Comp, {
+        bar: {
+          // @ts-expect-error
+          b: 2,
+        },
+      }),
+      root,
+    )
     expect(proxy.foo).toBe(1)
     expect(proxy.bar).toEqual({ b: 2 })
     expect(defaultFn).toHaveBeenCalledTimes(1)
 
-    render(h(Comp, { foo: 3, bar: { b: 3 } }), root)
+    render(
+      h(Comp, {
+        foo: 3,
+        bar: {
+          // @ts-expect-error
+          b: 3,
+        },
+      }),
+      root,
+    )
     expect(proxy.foo).toBe(3)
     expect(proxy.bar).toEqual({ b: 3 })
     expect(defaultFn).toHaveBeenCalledTimes(1)
 
-    render(h(Comp, { bar: { b: 4 } }), root)
+    render(
+      h(Comp, {
+        bar: {
+          // @ts-expect-error
+          b: 4,
+        },
+      }),
+      root,
+    )
     expect(proxy.foo).toBe(1)
     expect(proxy.bar).toEqual({ b: 4 })
     expect(defaultFn).toHaveBeenCalledTimes(1)
@@ -420,13 +448,19 @@ describe('component props', () => {
     }
     render(
       h(Comp, {
+        // @ts-expect-error
         bool: 'true',
+        // @ts-expect-error
         str: 100,
+        // @ts-expect-error
         num: '100',
+        // @ts-expect-error
         arr: {},
         obj: 'false',
         cls: {},
+        // @ts-expect-error
         fn: true,
+        // @ts-expect-error
         skipCheck: 'foo',
         empty: [1, 2, 3],
       }),
diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index 9e3240e4510..f39aa90b44e 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -214,7 +214,7 @@ export interface ComponentInternalOptions {
 
 export interface FunctionalComponent<
   P = {},
-  E extends EmitsOptions | Record<string, any[]> = string[],
+  E extends EmitsOptions | Record<string, any[]> = {},
   S extends Record<string, any> = any,
   EE extends EmitsOptions = ShortEmitsToObject<E>,
 > extends ComponentInternalOptions {
@@ -224,7 +224,7 @@ export interface FunctionalComponent<
     ctx: Omit<SetupContext<EE, IfAny<S, {}, SlotsType<S>>>, 'expose'>,
   ): any
   props?: ComponentPropsOptions<P>
-  emits?: EE | (keyof EE)[]
+  emits?: EE extends string[] ? EE : (keyof EE)[]
   slots?: IfAny<S, Slots, SlotsType<S>>
   inheritAttrs?: boolean
   displayName?: string
diff --git a/packages/runtime-core/src/h.ts b/packages/runtime-core/src/h.ts
index 832de9caddf..e0b760c3233 100644
--- a/packages/runtime-core/src/h.ts
+++ b/packages/runtime-core/src/h.ts
@@ -1,3 +1,17 @@
+import { type IfAny, isArray, isObject } from '@vue/shared'
+import type {
+  Component,
+  ConcreteComponent,
+  FunctionalComponent,
+} from './component'
+import type { EmitsOptions } from './componentEmits'
+import type {
+  ComponentObjectPropsOptions,
+  ExtractPublicPropTypes,
+} from './componentProps'
+import type { Suspense, SuspenseProps } from './components/Suspense'
+import type { Teleport, TeleportProps } from './components/Teleport'
+import type { RawSlots } from './componentSlots'
 import {
   type Comment,
   type Fragment,
@@ -8,17 +22,6 @@ import {
   createVNode,
   isVNode,
 } from './vnode'
-import type { Teleport, TeleportProps } from './components/Teleport'
-import type { Suspense, SuspenseProps } from './components/Suspense'
-import { type IfAny, isArray, isObject } from '@vue/shared'
-import type { RawSlots } from './componentSlots'
-import type {
-  Component,
-  ConcreteComponent,
-  FunctionalComponent,
-} from './component'
-import type { EmitsOptions } from './componentEmits'
-import type { DefineComponent } from './apiDefineComponent'
 
 // `h` is a more user-friendly version of `createVNode` that allows omitting the
 // props when possible. It is intended for manually written render functions.
@@ -157,6 +160,24 @@ export function h<P>(
   children?: RawChildren | RawSlots,
 ): VNode
 
+// export function h(type: { props: any }, children?: RawChildren): VNode
+export function h<
+  P extends string,
+  PP = ExtractPublicPropTypes<{ [K in P]: null }>,
+>(
+  type: { props: P[] },
+  props?: NoInfer<(RawProps & PP) | ({} extends PP ? null : never)>,
+  children?: RawChildren | RawSlots,
+): VNode
+export function h<
+  P extends ComponentObjectPropsOptions,
+  PP = ExtractPublicPropTypes<P>,
+>(
+  type: { props: P },
+  props?: NoInfer<(RawProps & PP) | ({} extends PP ? null : never)>,
+  children?: RawChildren | RawSlots,
+): VNode
+
 // concrete component
 export function h(
   type: ConcreteComponent | string,
@@ -168,21 +189,6 @@ export function h<P>(
   children?: RawChildren,
 ): VNode
 
-// component without props
-export function h<P>(
-  type: Component<P>,
-  props?: NoInfer<(RawProps & P) | null>,
-  children?: RawChildren | RawSlots,
-): VNode
-
-// fake constructor type returned by `defineComponent`
-export function h(type: DefineComponent, children?: RawChildren): VNode
-export function h<P>(
-  type: DefineComponent<P>,
-  props?: NoInfer<(RawProps & P) | ({} extends P ? null : never)>,
-  children?: RawChildren | RawSlots,
-): VNode
-
 // catch all types
 export function h(type: string | Component, children?: RawChildren): VNode
 export function h<P>(
diff --git a/packages/runtime-core/src/vnode.ts b/packages/runtime-core/src/vnode.ts
index a8c5340cd1f..73f25e46176 100644
--- a/packages/runtime-core/src/vnode.ts
+++ b/packages/runtime-core/src/vnode.ts
@@ -89,7 +89,7 @@ export type VNodeRef =
   | ((
       ref: Element | ComponentPublicInstance | null,
       refs: Record<string, any>,
-    ) => void)
+    ) => unknown)
 
 export type VNodeNormalizedRefAtom = {
   /**

From ed167e9e6b3dd8e39db6f8947f8d653f2315bae6 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 14:58:26 +0800
Subject: [PATCH 014/127] wip [skip ci]

---
 packages/runtime-core/src/component.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index f39aa90b44e..6b2495fbe49 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -214,17 +214,17 @@ export interface ComponentInternalOptions {
 
 export interface FunctionalComponent<
   P = {},
-  E extends EmitsOptions | Record<string, any[]> = {},
+  E extends EmitsOptions | Record<string, any[]> = string[],
   S extends Record<string, any> = any,
   EE extends EmitsOptions = ShortEmitsToObject<E>,
 > extends ComponentInternalOptions {
   // use of any here is intentional so it can be a valid JSX Element constructor
   (
-    props: P & EmitsToProps<EE>,
+    props: P & EmitsToProps<string[] extends E ? {} : EE>,
     ctx: Omit<SetupContext<EE, IfAny<S, {}, SlotsType<S>>>, 'expose'>,
   ): any
   props?: ComponentPropsOptions<P>
-  emits?: EE extends string[] ? EE : (keyof EE)[]
+  emits?: EE extends string[] ? EE : (keyof EE)[] | EE
   slots?: IfAny<S, Slots, SlotsType<S>>
   inheritAttrs?: boolean
   displayName?: string

From 8bd560d28170ac5af3440c4bf094eba83415a9ef Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 15:02:20 +0800
Subject: [PATCH 015/127] wip [skip ci]

---
 .../dts-test/defineComponent.test-d.tsx            | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 72a82017e45..7f3a0074ad9 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1571,20 +1571,6 @@ describe('expose component types', () => {
 
   expectType<typeof child>(parent.components!.child)
   expectType<Component>(parent.components!.child2)
-
-  // global components
-  expectType<Readonly<KeepAliveProps>>(
-    new parent.components!.KeepAlive().$props,
-  )
-  expectType<Readonly<KeepAliveProps>>(new child.components!.KeepAlive().$props)
-
-  // runtime-dom components
-  expectType<Readonly<TransitionProps>>(
-    new parent.components!.Transition().$props,
-  )
-  expectType<Readonly<TransitionProps>>(
-    new child.components!.Transition().$props,
-  )
 })
 
 describe('directive typing', () => {

From 2756e00b6f8c7f774e8e7b777142c9d227c812ff Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 15:18:12 +0800
Subject: [PATCH 016/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 23454ade509..5670bc51593 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -9,6 +9,7 @@ import type {
   SetupContext,
 } from './component'
 import type {
+  EmitsOptions,
   EmitsToProps,
   ObjectEmitsOptions,
   TypeEmitsToOptions,
@@ -131,7 +132,7 @@ export type DefineComponent<
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
-  E extends ObjectEmitsOptions = {},
+  E extends EmitsOptions = {},
   S extends SlotsType = SlotsType,
   Props = P & EmitsToProps<E>,
   PP = PublicProps,
@@ -162,7 +163,7 @@ export type DefineSetupFnComponent<
 // (uses user defined props interface)
 export function defineComponent<
   Props extends Record<string, any>,
-  E extends ObjectEmitsOptions = {},
+  E extends EmitsOptions = {},
   EE extends string = string,
   S extends SlotsType = {},
 >(
@@ -178,7 +179,7 @@ export function defineComponent<
 ): DefineSetupFnComponent<Props, E, S>
 export function defineComponent<
   Props extends Record<string, any>,
-  E extends ObjectEmitsOptions = {},
+  E extends EmitsOptions = {},
   EE extends string = string,
   S extends SlotsType = {},
 >(

From 2813eeb8d029388c9a302c3c5e5ca17b3e9b3ed7 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 15:21:28 +0800
Subject: [PATCH 017/127] wip [skip ci]

---
 packages-private/dts-test/defineComponent.test-d.tsx | 2 +-
 packages/runtime-core/src/apiDefineComponent.ts      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 7f3a0074ad9..c4026f32b3b 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1062,7 +1062,7 @@ describe('emits', () => {
   })
 
   // emit should be valid when ComponentPublicInstance is used.
-  const instance = {} as ComponentPublicInstance
+  const instance = {} as ComponentPublicInstance<{}, {}, {}, {}, {}, string[]>
   instance.$emit('test', 1)
   instance.$emit('test')
 
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 5670bc51593..1a98e2eee05 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -396,8 +396,11 @@ export function defineComponent<
       ? {}
       : RuntimeEmitsOptions
     : RuntimeEmitsKeys[]
-  components?: LocalComponents
-  directives?: Record<string, Directive> extends Directives ? {} : Directives
+  components?: LocalComponents & GlobalComponents
+  directives?: (Record<string, Directive> extends Directives
+    ? {}
+    : Directives) &
+    GlobalDirectives
   slots?: Slots
   expose?: Exposed[]
   computed?: Computed

From 918ce5016c68d238bc3b0343994d10df5c0e1d0e Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 15:32:01 +0800
Subject: [PATCH 018/127] wip [skip ci]

---
 packages-private/dts-test/defineComponent.test-d.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index c4026f32b3b..865c1a8cbd4 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1261,7 +1261,7 @@ describe('should allow to assign props', () => {
 
   const Parent = defineComponent({
     props: {
-      ...Child.props,
+      ...Child.props!,
       foo: String,
     },
   })

From 357fca4f83b1f3b943070cd86f5722c49cb2728b Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 15:32:24 +0800
Subject: [PATCH 019/127] Revert "wip [skip ci]"

This reverts commit 8bd560d28170ac5af3440c4bf094eba83415a9ef.
---
 .../dts-test/defineComponent.test-d.tsx            | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 865c1a8cbd4..2b45c2ea0da 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1571,6 +1571,20 @@ describe('expose component types', () => {
 
   expectType<typeof child>(parent.components!.child)
   expectType<Component>(parent.components!.child2)
+
+  // global components
+  expectType<Readonly<KeepAliveProps>>(
+    new parent.components!.KeepAlive().$props,
+  )
+  expectType<Readonly<KeepAliveProps>>(new child.components!.KeepAlive().$props)
+
+  // runtime-dom components
+  expectType<Readonly<TransitionProps>>(
+    new parent.components!.Transition().$props,
+  )
+  expectType<Readonly<TransitionProps>>(
+    new child.components!.Transition().$props,
+  )
 })
 
 describe('directive typing', () => {

From d5318a957868f74f51d914d3536ec63757d87d4f Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 17:20:42 +0800
Subject: [PATCH 020/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 1a98e2eee05..db2222cac1c 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -234,9 +234,18 @@ export function defineComponent<
   >,
   NormalizedEmitsOptions extends ObjectEmitsOptions = unknown extends TypeEmits
     ? string extends RuntimeEmitsKeys
-      ? RuntimeEmitsOptions
+      ? ObjectEmitsOptions extends RuntimeEmitsOptions
+        ? {}
+        : RuntimeEmitsOptions
       : { [K in RuntimeEmitsKeys]: (...args: any) => any }
     : {},
+  IsDefaultEmitsOptions = unknown extends TypeEmits
+    ? string extends RuntimeEmitsKeys
+      ? ObjectEmitsOptions extends RuntimeEmitsOptions
+        ? true
+        : false
+      : false
+    : false,
   NormalizedInjectOptions extends
     ObjectInjectOptions = string extends InjectKeys
     ? InjectOptions
@@ -260,30 +269,23 @@ export function defineComponent<
   CompleteData = MixinData & EnsureNonVoid<Data>,
   CompleteComputed extends ComputedOptions = MixinComputeds & Computed,
   CompleteMethods extends MethodOptions = MixinMethods & Methods,
-  CompleteEmits_Internal extends ObjectEmitsOptions = MixinEmits &
+  CompleteEmits extends ObjectEmitsOptions = MixinEmits &
     NormalizedEmitsOptions,
-  CompleteEmits_Public extends ObjectEmitsOptions = MixinEmits &
-    (ObjectEmitsOptions extends NormalizedEmitsOptions
-      ? {}
-      : NormalizedEmitsOptions),
   // resolved types
-  EmitsOptionsByType = TypeEmitsToOptions<TypeEmits & {}>,
+  ResolvedEmitsOptions extends ObjectEmitsOptions = CompleteEmits &
+    TypeEmitsToOptions<TypeEmits & {}>,
   ResolvedEmitsOptions_Internal extends
-    ObjectEmitsOptions = CompleteEmits_Internal & EmitsOptionsByType,
-  ResolvedEmitsOptions_Public extends
-    ObjectEmitsOptions = CompleteEmits_Public & EmitsOptionsByType,
-  InferredProps = ExtractPropTypes<CompleteProps> & TypeProps,
-  InferredProps_Internal = Readonly<
-    InferredProps &
-      EmitsToProps<CompleteEmits_Internal & ResolvedEmitsOptions_Internal>
-  >,
-  InferredProps_Public = Readonly<
-    InferredProps &
-      EmitsToProps<CompleteEmits_Public & ResolvedEmitsOptions_Public>
+    EmitsOptions = IsDefaultEmitsOptions extends true
+    ? string[]
+    : ResolvedEmitsOptions,
+  InferredProps = Readonly<
+    ExtractPropTypes<CompleteProps> &
+      TypeProps &
+      EmitsToProps<CompleteEmits & ResolvedEmitsOptions>
   >,
   // instance types
   DataInstance = ComponentPublicInstance<
-    InferredProps_Internal,
+    InferredProps,
     CompleteBindings,
     MixinData,
     MixinComputeds,
@@ -291,7 +293,7 @@ export function defineComponent<
     ResolvedEmitsOptions_Internal
   >,
   InternalInstance = ComponentPublicInstance<
-    InferredProps_Internal,
+    InferredProps,
     CompleteBindings,
     CompleteData,
     CompleteComputed,
@@ -307,12 +309,12 @@ export function defineComponent<
     TypeEl
   >,
   PublicInstance = ComponentPublicInstance<
-    InferredProps_Public,
+    InferredProps,
     CompleteBindings,
     CompleteData,
     CompleteComputed,
     CompleteMethods,
-    ResolvedEmitsOptions_Public,
+    ResolvedEmitsOptions,
     PublicProps,
     RuntimePropsOptionsDefaults,
     // MakeDefaultsOptional - if TypeProps is provided, set to false to use
@@ -340,8 +342,8 @@ export function defineComponent<
     extends?: Extends
     setup?: (
       this: void,
-      props: LooseRequired<InferredProps_Internal>,
-      ctx: SetupContext<NormalizedEmitsOptions, Slots>,
+      props: NoInfer<LooseRequired<InferredProps>>,
+      ctx: NoInfer<SetupContext<ResolvedEmitsOptions_Internal, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
     data?: (this: DataInstance, vm: DataInstance) => Data
     /**

From 7f38e0054e5054b32fbd7c7e3c2e4013253a4544 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 17:44:56 +0800
Subject: [PATCH 021/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    | 86 ++++++++-----------
 1 file changed, 35 insertions(+), 51 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index db2222cac1c..4fa0fd434ba 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -15,6 +15,7 @@ import type {
   TypeEmitsToOptions,
 } from './componentEmits'
 import type {
+  ComponentInjectOptions,
   ComponentOptions,
   ComponentOptionsBase,
   ComponentProvideOptions,
@@ -201,14 +202,9 @@ export function defineComponent<
   TypeEmits extends ComponentTypeEmits | unknown = unknown,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-  RuntimePropsKeys extends string = string,
-  RuntimeEmitsKeys extends string = string,
-  InjectKeys extends string = string,
-  Exposed extends string = string,
-  RuntimePropsOptions extends
-    ComponentObjectPropsOptions = ComponentObjectPropsOptions,
-  RuntimeEmitsOptions extends ObjectEmitsOptions = ObjectEmitsOptions,
-  InjectOptions extends ObjectInjectOptions = {},
+  PropsOptions extends ComponentPropsOptions = {},
+  RuntimeEmitsOptions extends EmitsOptions = ObjectEmitsOptions,
+  InjectOptions extends ComponentInjectOptions = {},
   Data = {},
   SetupBindings = {},
   Computed extends ComputedOptions = {},
@@ -217,42 +213,36 @@ export function defineComponent<
   Extends = {},
   Slots extends SlotsType = {},
   LocalComponents extends Record<string, Component> = {},
-  Directives extends Record<string, Directive> = Record<string, Directive>,
+  Directives extends Record<string, Directive> = {},
   Provide extends ComponentProvideOptions = {},
+  // assisted input types
+  _PropsKeys extends string = string,
+  _EmitsKeys extends string = string,
+  _InjectKeys extends string = string,
+  Exposed extends string = string,
   // normalized types
   NormalizedPropsOptions = unknown extends TypeProps
-    ? string extends RuntimePropsKeys
-      ? ComponentObjectPropsOptions extends RuntimePropsOptions
-        ? {}
-        : RuntimePropsOptions
-      : { [K in RuntimePropsKeys]: null }
+    ? PropsOptions extends (infer Keys extends string)[]
+      ? { [K in Keys]: null }
+      : PropsOptions
     : {},
-  RuntimePropsOptionsDefaults = ExtractDefaultPropTypes<
-    ComponentObjectPropsOptions extends RuntimePropsOptions
-      ? {}
-      : RuntimePropsOptions
-  >,
+  RuntimePropsOptionsDefaults = ExtractDefaultPropTypes<PropsOptions>,
   NormalizedEmitsOptions extends ObjectEmitsOptions = unknown extends TypeEmits
-    ? string extends RuntimeEmitsKeys
-      ? ObjectEmitsOptions extends RuntimeEmitsOptions
+    ? RuntimeEmitsOptions extends (infer Keys extends string)[]
+      ? { [K in Keys]: (...args: any) => any }
+      : ObjectEmitsOptions extends RuntimeEmitsOptions
         ? {}
         : RuntimeEmitsOptions
-      : { [K in RuntimeEmitsKeys]: (...args: any) => any }
     : {},
   IsDefaultEmitsOptions = unknown extends TypeEmits
-    ? string extends RuntimeEmitsKeys
-      ? ObjectEmitsOptions extends RuntimeEmitsOptions
-        ? true
-        : false
+    ? ObjectEmitsOptions extends RuntimeEmitsOptions
+      ? true
       : false
     : false,
   NormalizedInjectOptions extends
-    ObjectInjectOptions = string extends InjectKeys
-    ? InjectOptions
-    : { [K in InjectKeys]: any },
-  NormalizedDirectives = Record<string, Directive> extends Directives
-    ? {}
-    : Directives,
+    ObjectInjectOptions = InjectOptions extends (infer Keys extends string)[]
+    ? { [K in Keys]: any }
+    : InjectOptions,
   // mixin inference
   MixinProps = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>,
   MixinEmits = ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends>,
@@ -328,16 +318,19 @@ export function defineComponent<
   >,
 >(
   options: {
-    props?: (RuntimePropsOptions & ThisType<void>) | RuntimePropsKeys[]
-    emits?: (RuntimeEmitsOptions & ThisType<void>) | RuntimeEmitsKeys[]
+    props?:
+      | ComponentObjectPropsOptions
+      | (PropsOptions & ThisType<void>)
+      | _PropsKeys[]
+    emits?: (RuntimeEmitsOptions & ThisType<void>) | _EmitsKeys[]
     components?: LocalComponents
-    directives?: Directives
+    directives?: Record<string, Directive> | Directives
     slots?: Slots
     expose?: Exposed[]
     computed?: Computed
     methods?: Methods
     provide?: Provide
-    inject?: InjectOptions | InjectKeys[]
+    inject?: InjectOptions | _InjectKeys[]
     mixins?: Mixin[]
     extends?: Extends
     setup?: (
@@ -388,27 +381,18 @@ export function defineComponent<
       }
     >,
 ): {
-  props?: string extends RuntimePropsKeys
-    ? ComponentObjectPropsOptions extends RuntimePropsOptions
-      ? {}
-      : RuntimePropsOptions
-    : RuntimePropsKeys[]
-  emits?: string extends RuntimeEmitsKeys
-    ? ObjectEmitsOptions extends RuntimeEmitsOptions
-      ? {}
-      : RuntimeEmitsOptions
-    : RuntimeEmitsKeys[]
-  components?: LocalComponents & GlobalComponents
-  directives?: (Record<string, Directive> extends Directives
+  props?: PropsOptions
+  emits?: ObjectEmitsOptions extends RuntimeEmitsOptions
     ? {}
-    : Directives) &
-    GlobalDirectives
+    : RuntimeEmitsOptions
+  components?: LocalComponents & GlobalComponents
+  directives?: Directives & GlobalDirectives
   slots?: Slots
   expose?: Exposed[]
   computed?: Computed
   methods?: Methods
   provide?: Provide
-  inject?: string extends InjectKeys ? InjectOptions : InjectKeys[]
+  inject?: InjectOptions
   mixins?: Mixin[]
   extends?: Extends
   setup?(): SetupBindings

From aba56a0820fe2a14953f4d0c796a2243befeea0a Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 19:03:47 +0800
Subject: [PATCH 022/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    | 28 +++++++++----------
 packages/runtime-core/src/componentEmits.ts   |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 4fa0fd434ba..e8776d2508a 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -11,6 +11,7 @@ import type {
 import type {
   EmitsOptions,
   EmitsToProps,
+  IsNever,
   ObjectEmitsOptions,
   TypeEmitsToOptions,
 } from './componentEmits'
@@ -203,7 +204,7 @@ export function defineComponent<
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
   PropsOptions extends ComponentPropsOptions = {},
-  RuntimeEmitsOptions extends EmitsOptions = ObjectEmitsOptions,
+  RuntimeEmitsOptions extends EmitsOptions = never,
   InjectOptions extends ComponentInjectOptions = {},
   Data = {},
   SetupBindings = {},
@@ -228,16 +229,14 @@ export function defineComponent<
     : {},
   RuntimePropsOptionsDefaults = ExtractDefaultPropTypes<PropsOptions>,
   NormalizedEmitsOptions extends ObjectEmitsOptions = unknown extends TypeEmits
-    ? RuntimeEmitsOptions extends (infer Keys extends string)[]
-      ? { [K in Keys]: (...args: any) => any }
-      : ObjectEmitsOptions extends RuntimeEmitsOptions
-        ? {}
+    ? IsNever<RuntimeEmitsOptions> extends true
+      ? {}
+      : RuntimeEmitsOptions extends (infer Keys extends string)[]
+        ? { [K in Keys]: (...args: any) => any }
         : RuntimeEmitsOptions
     : {},
   IsDefaultEmitsOptions = unknown extends TypeEmits
-    ? ObjectEmitsOptions extends RuntimeEmitsOptions
-      ? true
-      : false
+    ? IsNever<RuntimeEmitsOptions>
     : false,
   NormalizedInjectOptions extends
     ObjectInjectOptions = InjectOptions extends (infer Keys extends string)[]
@@ -322,15 +321,18 @@ export function defineComponent<
       | ComponentObjectPropsOptions
       | (PropsOptions & ThisType<void>)
       | _PropsKeys[]
-    emits?: (RuntimeEmitsOptions & ThisType<void>) | _EmitsKeys[]
-    components?: LocalComponents
+    emits?:
+      | ObjectEmitsOptions
+      | (RuntimeEmitsOptions & ThisType<void>)
+      | _EmitsKeys[]
+    components?: Record<string, Component> | LocalComponents
     directives?: Record<string, Directive> | Directives
     slots?: Slots
     expose?: Exposed[]
     computed?: Computed
     methods?: Methods
     provide?: Provide
-    inject?: InjectOptions | _InjectKeys[]
+    inject?: ObjectInjectOptions | InjectOptions | _InjectKeys[]
     mixins?: Mixin[]
     extends?: Extends
     setup?: (
@@ -382,9 +384,7 @@ export function defineComponent<
     >,
 ): {
   props?: PropsOptions
-  emits?: ObjectEmitsOptions extends RuntimeEmitsOptions
-    ? {}
-    : RuntimeEmitsOptions
+  emits?: IsNever<RuntimeEmitsOptions> extends true ? {} : RuntimeEmitsOptions
   components?: LocalComponents & GlobalComponents
   directives?: Directives & GlobalDirectives
   slots?: Slots
diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
index bc040815f68..e0fef8a8262 100644
--- a/packages/runtime-core/src/componentEmits.ts
+++ b/packages/runtime-core/src/componentEmits.ts
@@ -83,7 +83,7 @@ type IsStringLiteral<T> = T extends string
     : true
   : false
 
-type IsNever<T> = [T] extends [never] ? true : false
+export type IsNever<T> = [T] extends [never] ? true : false
 
 export type ShortEmitsToObject<E> =
   E extends Record<string, any[]>

From 31b5f6c88837853d380acc0ad9e19662328a7d83 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 19:37:21 +0800
Subject: [PATCH 023/127] wip [skip ci]

---
 packages-private/dts-test/defineComponent.test-d.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 2b45c2ea0da..52815ae54ce 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1641,7 +1641,6 @@ import type {
   AllowedComponentProps,
   ComponentCustomProps,
   ComponentInstance,
-  ComponentOptionsMixin,
   DefineComponent,
   Directive,
   ExtractPropTypes,
@@ -1659,8 +1658,8 @@ declare const MyButton: DefineComponent<
   {},
   {},
   {},
-  ComponentOptionsMixin,
-  ComponentOptionsMixin,
+  {},
+  {},
   {},
   VNodeProps & AllowedComponentProps & ComponentCustomProps,
   Readonly<ExtractPropTypes<{}>>,
@@ -1891,8 +1890,8 @@ declare const ErrorMessage: {
     unknown,
     {},
     {},
-    vue.ComponentOptionsMixin,
-    vue.ComponentOptionsMixin,
+    {},
+    {},
     {},
     vue.VNodeProps &
       vue.AllowedComponentProps &

From 266fe531816a3b1e2ebf7aa92ff2e00da0675f63 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 19:56:49 +0800
Subject: [PATCH 024/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index e8776d2508a..70a0e1a3f5a 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -227,7 +227,6 @@ export function defineComponent<
       ? { [K in Keys]: null }
       : PropsOptions
     : {},
-  RuntimePropsOptionsDefaults = ExtractDefaultPropTypes<PropsOptions>,
   NormalizedEmitsOptions extends ObjectEmitsOptions = unknown extends TypeEmits
     ? IsNever<RuntimeEmitsOptions> extends true
       ? {}
@@ -305,7 +304,7 @@ export function defineComponent<
     CompleteMethods,
     ResolvedEmitsOptions,
     PublicProps,
-    RuntimePropsOptionsDefaults,
+    ExtractDefaultPropTypes<MixinProps & PropsOptions>,
     // MakeDefaultsOptional - if TypeProps is provided, set to false to use
     // user props types verbatim
     unknown extends TypeProps ? true : false,

From e3d44ce8f2be27714cb2b8b8a7feeb81afe4b8f9 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 20:47:54 +0800
Subject: [PATCH 025/127] wip [skip ci]

---
 .../dts-test/defineComponent.test-d.tsx       |  4 +---
 .../runtime-core/src/apiDefineComponent.ts    | 19 ++++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 52815ae54ce..4e99bcab824 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1969,9 +1969,7 @@ declare const ErrorMessage: {
   string,
   {}
 > &
-  vue.VNodeProps &
-  vue.AllowedComponentProps &
-  vue.ComponentCustomProps &
+  vue.PublicProps &
   (new () => {
     $slots: {
       default: (arg: ErrorMessageSlotProps) => VNode[]
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 70a0e1a3f5a..5a03080e163 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -258,18 +258,11 @@ export function defineComponent<
   CompleteComputed extends ComputedOptions = MixinComputeds & Computed,
   CompleteMethods extends MethodOptions = MixinMethods & Methods,
   CompleteEmits extends ObjectEmitsOptions = MixinEmits &
-    NormalizedEmitsOptions,
-  // resolved types
-  ResolvedEmitsOptions extends ObjectEmitsOptions = CompleteEmits &
+    NormalizedEmitsOptions &
     TypeEmitsToOptions<TypeEmits & {}>,
-  ResolvedEmitsOptions_Internal extends
-    EmitsOptions = IsDefaultEmitsOptions extends true
-    ? string[]
-    : ResolvedEmitsOptions,
+  // resolved types
   InferredProps = Readonly<
-    ExtractPropTypes<CompleteProps> &
-      TypeProps &
-      EmitsToProps<CompleteEmits & ResolvedEmitsOptions>
+    ExtractPropTypes<CompleteProps> & TypeProps & EmitsToProps<CompleteEmits>
   >,
   // instance types
   DataInstance = ComponentPublicInstance<
@@ -278,7 +271,7 @@ export function defineComponent<
     MixinData,
     MixinComputeds,
     CompleteMethods,
-    ResolvedEmitsOptions_Internal
+    IsDefaultEmitsOptions extends true ? string[] : CompleteEmits
   >,
   InternalInstance = ComponentPublicInstance<
     InferredProps,
@@ -286,7 +279,7 @@ export function defineComponent<
     CompleteData,
     CompleteComputed,
     CompleteMethods,
-    ResolvedEmitsOptions_Internal,
+    IsDefaultEmitsOptions extends true ? string[] : CompleteEmits,
     {}, // PublicProps
     {}, // Defaults
     false,
@@ -302,7 +295,7 @@ export function defineComponent<
     CompleteData,
     CompleteComputed,
     CompleteMethods,
-    ResolvedEmitsOptions,
+    CompleteEmits,
     PublicProps,
     ExtractDefaultPropTypes<MixinProps & PropsOptions>,
     // MakeDefaultsOptional - if TypeProps is provided, set to false to use

From 2c6b7ee2aba73d398b89e6a0874fa4e7f6ff16c2 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 20:49:03 +0800
Subject: [PATCH 026/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 5a03080e163..98c70e80b2f 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -260,7 +260,10 @@ export function defineComponent<
   CompleteEmits extends ObjectEmitsOptions = MixinEmits &
     NormalizedEmitsOptions &
     TypeEmitsToOptions<TypeEmits & {}>,
-  // resolved types
+  CompleteEmits_Internal extends
+    EmitsOptions = IsDefaultEmitsOptions extends true
+    ? string[]
+    : CompleteEmits,
   InferredProps = Readonly<
     ExtractPropTypes<CompleteProps> & TypeProps & EmitsToProps<CompleteEmits>
   >,
@@ -271,7 +274,7 @@ export function defineComponent<
     MixinData,
     MixinComputeds,
     CompleteMethods,
-    IsDefaultEmitsOptions extends true ? string[] : CompleteEmits
+    CompleteEmits_Internal
   >,
   InternalInstance = ComponentPublicInstance<
     InferredProps,
@@ -279,7 +282,7 @@ export function defineComponent<
     CompleteData,
     CompleteComputed,
     CompleteMethods,
-    IsDefaultEmitsOptions extends true ? string[] : CompleteEmits,
+    CompleteEmits_Internal,
     {}, // PublicProps
     {}, // Defaults
     false,
@@ -330,7 +333,7 @@ export function defineComponent<
     setup?: (
       this: void,
       props: NoInfer<LooseRequired<InferredProps>>,
-      ctx: NoInfer<SetupContext<ResolvedEmitsOptions_Internal, Slots>>,
+      ctx: NoInfer<SetupContext<CompleteEmits_Internal, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
     data?: (this: DataInstance, vm: DataInstance) => Data
     /**

From d25cccbaf055b31b19a96f1cef58b9a2fa876ea8 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 21:22:05 +0800
Subject: [PATCH 027/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 98c70e80b2f..a1c41c84200 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -268,14 +268,6 @@ export function defineComponent<
     ExtractPropTypes<CompleteProps> & TypeProps & EmitsToProps<CompleteEmits>
   >,
   // instance types
-  DataInstance = ComponentPublicInstance<
-    InferredProps,
-    CompleteBindings,
-    MixinData,
-    MixinComputeds,
-    CompleteMethods,
-    CompleteEmits_Internal
-  >,
   InternalInstance = ComponentPublicInstance<
     InferredProps,
     CompleteBindings,
@@ -292,6 +284,14 @@ export function defineComponent<
     TypeRefs,
     TypeEl
   >,
+  InternalInstance2 = InternalInstance &
+    ComponentPublicInstance<
+      {},
+      {},
+      CompleteData,
+      CompleteComputed,
+      CompleteMethods
+    >,
   PublicInstance = ComponentPublicInstance<
     InferredProps,
     CompleteBindings,
@@ -335,7 +335,10 @@ export function defineComponent<
       props: NoInfer<LooseRequired<InferredProps>>,
       ctx: NoInfer<SetupContext<CompleteEmits_Internal, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
-    data?: (this: DataInstance, vm: DataInstance) => Data
+    data?: (
+      this: NoInfer<InternalInstance>,
+      vm: NoInfer<InternalInstance>,
+    ) => Data
     /**
      * @private for language-tools use only
      */
@@ -373,7 +376,7 @@ export function defineComponent<
     | 'data'
   > &
     ThisType<
-      Omit<InternalInstance, '$options'> & {
+      Omit<NoInfer<InternalInstance2>, '$options'> & {
         $options: typeof options
       }
     >,

From 90043da6f6d378edc9763e0e55f2324af4052094 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 18 Feb 2025 21:22:56 +0800
Subject: [PATCH 028/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index a1c41c84200..348bd5c7476 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -268,7 +268,7 @@ export function defineComponent<
     ExtractPropTypes<CompleteProps> & TypeProps & EmitsToProps<CompleteEmits>
   >,
   // instance types
-  InternalInstance = ComponentPublicInstance<
+  DataVM = ComponentPublicInstance<
     InferredProps,
     CompleteBindings,
     CompleteData,
@@ -284,7 +284,7 @@ export function defineComponent<
     TypeRefs,
     TypeEl
   >,
-  InternalInstance2 = InternalInstance &
+  InternalInstance = DataVM &
     ComponentPublicInstance<
       {},
       {},
@@ -335,10 +335,7 @@ export function defineComponent<
       props: NoInfer<LooseRequired<InferredProps>>,
       ctx: NoInfer<SetupContext<CompleteEmits_Internal, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
-    data?: (
-      this: NoInfer<InternalInstance>,
-      vm: NoInfer<InternalInstance>,
-    ) => Data
+    data?: (this: NoInfer<DataVM>, vm: NoInfer<DataVM>) => Data
     /**
      * @private for language-tools use only
      */
@@ -376,7 +373,7 @@ export function defineComponent<
     | 'data'
   > &
     ThisType<
-      Omit<NoInfer<InternalInstance2>, '$options'> & {
+      Omit<NoInfer<InternalInstance>, '$options'> & {
         $options: typeof options
       }
     >,

From f3a58849e6ab7211edbf9394475d6657c64762fc Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 09:27:16 +0800
Subject: [PATCH 029/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 348bd5c7476..3be7a721bc7 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -222,11 +222,6 @@ export function defineComponent<
   _InjectKeys extends string = string,
   Exposed extends string = string,
   // normalized types
-  NormalizedPropsOptions = unknown extends TypeProps
-    ? PropsOptions extends (infer Keys extends string)[]
-      ? { [K in Keys]: null }
-      : PropsOptions
-    : {},
   NormalizedEmitsOptions extends ObjectEmitsOptions = unknown extends TypeEmits
     ? IsNever<RuntimeEmitsOptions> extends true
       ? {}
@@ -237,10 +232,6 @@ export function defineComponent<
   IsDefaultEmitsOptions = unknown extends TypeEmits
     ? IsNever<RuntimeEmitsOptions>
     : false,
-  NormalizedInjectOptions extends
-    ObjectInjectOptions = InjectOptions extends (infer Keys extends string)[]
-    ? { [K in Keys]: any }
-    : InjectOptions,
   // mixin inference
   MixinProps = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>,
   MixinEmits = ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends>,
@@ -250,9 +241,13 @@ export function defineComponent<
   MixinComputeds extends ComputedOptions = ExtractMixinComputed<Mixin> &
     ExtractMixinComputed<Extends> & {},
   MixinMethods = ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends>,
-  MixinDefaults = {}, // TODO
   // merged types
-  CompleteProps = MixinProps & NormalizedPropsOptions,
+  CompleteProps = MixinProps &
+    (unknown extends TypeProps
+      ? PropsOptions extends (infer Keys extends string)[]
+        ? { [K in Keys]: null }
+        : PropsOptions
+      : {}),
   CompleteBindings = MixinBindings & SetupBindings,
   CompleteData = MixinData & EnsureNonVoid<Data>,
   CompleteComputed extends ComputedOptions = MixinComputeds & Computed,
@@ -278,7 +273,7 @@ export function defineComponent<
     {}, // PublicProps
     {}, // Defaults
     false,
-    NormalizedInjectOptions,
+    InjectOptions,
     Slots,
     Exposed,
     TypeRefs,

From 3369e849eec24752f8fcbecd88cbbbcff52f5cec Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 09:46:41 +0800
Subject: [PATCH 030/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 3be7a721bc7..bdb9b2c7f31 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -216,48 +216,45 @@ export function defineComponent<
   LocalComponents extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Provide extends ComponentProvideOptions = {},
+  Exposed extends string = string,
   // assisted input types
   _PropsKeys extends string = string,
   _EmitsKeys extends string = string,
   _InjectKeys extends string = string,
-  Exposed extends string = string,
-  // normalized types
-  NormalizedEmitsOptions extends ObjectEmitsOptions = unknown extends TypeEmits
-    ? IsNever<RuntimeEmitsOptions> extends true
-      ? {}
-      : RuntimeEmitsOptions extends (infer Keys extends string)[]
-        ? { [K in Keys]: (...args: any) => any }
-        : RuntimeEmitsOptions
-    : {},
-  IsDefaultEmitsOptions = unknown extends TypeEmits
-    ? IsNever<RuntimeEmitsOptions>
-    : false,
-  // mixin inference
-  MixinProps = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>,
-  MixinEmits = ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends>,
-  MixinBindings = ExtractMixinSetupBindings<Mixin> &
-    ExtractMixinSetupBindings<Extends>,
-  MixinData = ExtractMixinData<Mixin> & ExtractMixinData<Extends>,
-  MixinComputeds extends ComputedOptions = ExtractMixinComputed<Mixin> &
-    ExtractMixinComputed<Extends> & {},
-  MixinMethods = ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends>,
   // merged types
-  CompleteProps = MixinProps &
+  CompleteProps = ExtractMixinProps<Mixin> &
+    ExtractMixinProps<Extends> &
     (unknown extends TypeProps
       ? PropsOptions extends (infer Keys extends string)[]
         ? { [K in Keys]: null }
         : PropsOptions
       : {}),
-  CompleteBindings = MixinBindings & SetupBindings,
-  CompleteData = MixinData & EnsureNonVoid<Data>,
-  CompleteComputed extends ComputedOptions = MixinComputeds & Computed,
-  CompleteMethods extends MethodOptions = MixinMethods & Methods,
-  CompleteEmits extends ObjectEmitsOptions = MixinEmits &
-    NormalizedEmitsOptions &
+  CompleteBindings = ExtractMixinSetupBindings<Mixin> &
+    ExtractMixinSetupBindings<Extends> &
+    SetupBindings,
+  CompleteData = ExtractMixinData<Mixin> &
+    ExtractMixinData<Extends> &
+    EnsureNonVoid<Data>,
+  CompleteComputed extends ComputedOptions = ExtractMixinComputed<Mixin> &
+    ExtractMixinComputed<Extends> &
+    Computed,
+  CompleteMethods extends MethodOptions = ExtractMixinMethods<Mixin> &
+    ExtractMixinMethods<Extends> &
+    Methods,
+  CompleteEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
+    ExtractMixinEmits<Extends> &
+    (unknown extends TypeEmits
+      ? IsNever<RuntimeEmitsOptions> extends true
+        ? {}
+        : RuntimeEmitsOptions extends (infer Keys extends string)[]
+          ? { [K in Keys]: (...args: any) => any }
+          : RuntimeEmitsOptions
+      : {}) &
     TypeEmitsToOptions<TypeEmits & {}>,
-  CompleteEmits_Internal extends
-    EmitsOptions = IsDefaultEmitsOptions extends true
-    ? string[]
+  CompleteEmits_Internal extends EmitsOptions = unknown extends TypeEmits
+    ? IsNever<RuntimeEmitsOptions> extends true
+      ? string[]
+      : CompleteEmits
     : CompleteEmits,
   InferredProps = Readonly<
     ExtractPropTypes<CompleteProps> & TypeProps & EmitsToProps<CompleteEmits>
@@ -295,7 +292,9 @@ export function defineComponent<
     CompleteMethods,
     CompleteEmits,
     PublicProps,
-    ExtractDefaultPropTypes<MixinProps & PropsOptions>,
+    ExtractDefaultPropTypes<
+      ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
+    >,
     // MakeDefaultsOptional - if TypeProps is provided, set to false to use
     // user props types verbatim
     unknown extends TypeProps ? true : false,

From f25a4cb015095e0a0cb63ce00b703ee8733cfbb0 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 12:31:37 +0800
Subject: [PATCH 031/127] wip [skip ci]

---
 .../dts-test/defineComponent.test-d.tsx       | 52 +------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 4e99bcab824..1a3e46082f1 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1918,57 +1918,7 @@ declare const ErrorMessage: {
   __isFragment?: never
   __isTeleport?: never
   __isSuspense?: never
-} & vue.ComponentOptionsBase<
-  Readonly<
-    vue.ExtractPropTypes<{
-      as: {
-        type: StringConstructor
-        default: any
-      }
-      name: {
-        type: StringConstructor
-        required: true
-      }
-    }>
-  >,
-  () =>
-    | VNode<
-        vue.RendererNode,
-        vue.RendererElement,
-        {
-          [key: string]: any
-        }
-      >
-    | vue.Slot<any>
-    | VNode<
-        vue.RendererNode,
-        vue.RendererElement,
-        {
-          [key: string]: any
-        }
-      >[]
-    | {
-        default: () => VNode<
-          vue.RendererNode,
-          vue.RendererElement,
-          {
-            [key: string]: any
-          }
-        >[]
-      },
-  unknown,
-  {},
-  {},
-  vue.ComponentOptionsMixin,
-  vue.ComponentOptionsMixin,
-  {},
-  string,
-  {
-    as: string
-  },
-  string,
-  {}
-> &
+} & vue.ComponentOptionsBase &
   vue.PublicProps &
   (new () => {
     $slots: {

From be3a3e0101df6b61c7c6e0aa218d72e9928ba6fd Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 13:09:14 +0800
Subject: [PATCH 032/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts      | 2 +-
 packages/runtime-core/src/apiSetupHelpers.ts         | 2 +-
 packages/runtime-core/src/componentOptions.ts        | 2 +-
 packages/runtime-dom/__tests__/customElement.spec.ts | 2 +-
 packages/runtime-dom/src/apiCustomElement.ts         | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index bdb9b2c7f31..50785f7a0d1 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -1,4 +1,4 @@
-import { extend, isFunction, LooseRequired } from '@vue/shared'
+import { type LooseRequired, extend, isFunction } from '@vue/shared'
 import type { ComponentTypeEmits } from './apiSetupHelpers'
 import type {
   AllowedComponentProps,
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 06d89d4a4f7..ef043c16279 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -30,7 +30,7 @@ import type {
 import { warn } from './warning'
 import type { SlotsType, StrictUnwrapSlotsType } from './componentSlots'
 import type { Ref } from '@vue/reactivity'
-import { CreateComponentPublicInstanceWithMixins } from './componentPublicInstance'
+import type { CreateComponentPublicInstanceWithMixins } from './componentPublicInstance'
 
 // dev only
 const warnRuntimeUsage = (method: string) =>
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 9b0456216a1..fca4439eaf1 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -55,7 +55,7 @@ import type { Directive } from './directives'
 import {
   type ComponentPublicInstance,
   type CreateComponentPublicInstanceWithMixins,
-  ExtractMixinProps,
+  type ExtractMixinProps,
   isReservedPrefix,
 } from './componentPublicInstance'
 import { warn } from './warning'
diff --git a/packages/runtime-dom/__tests__/customElement.spec.ts b/packages/runtime-dom/__tests__/customElement.spec.ts
index 2512563ba92..972799f6e98 100644
--- a/packages/runtime-dom/__tests__/customElement.spec.ts
+++ b/packages/runtime-dom/__tests__/customElement.spec.ts
@@ -4,7 +4,7 @@ import {
   type Ref,
   Teleport,
   type VueElement,
-  VueElementConstructor,
+  type VueElementConstructor,
   createApp,
   defineAsyncComponent,
   defineComponent,
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index 8987dc1744e..a7a844cc6d5 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -15,6 +15,7 @@ import {
   type Directive,
   type EmitsOptions,
   type EmitsToProps,
+  type ExtractMixinProps,
   type ExtractPropTypes,
   type MethodOptions,
   type ObjectEmitsOptions,
@@ -23,7 +24,6 @@ import {
   type SlotsType,
   type VNode,
   type VNodeProps,
-  type ExtractMixinProps,
   createVNode,
   defineComponent,
   getCurrentInstance,
@@ -32,14 +32,14 @@ import {
   warn,
 } from '@vue/runtime-core'
 import {
+  type LooseRequired,
+  type Prettify,
   camelize,
   extend,
   hasOwn,
   hyphenate,
   isArray,
   isPlainObject,
-  LooseRequired,
-  Prettify,
   toNumber,
 } from '@vue/shared'
 import { createApp, createSSRApp, render } from '.'

From d82290789dc3d742577075013207fb6ceca74200 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 14:22:14 +0800
Subject: [PATCH 033/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 50785f7a0d1..b91b417ae0a 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -276,14 +276,22 @@ export function defineComponent<
     TypeRefs,
     TypeEl
   >,
-  InternalInstance = DataVM &
-    ComponentPublicInstance<
-      {},
-      {},
-      CompleteData,
-      CompleteComputed,
-      CompleteMethods
-    >,
+  InternalInstance = ComponentPublicInstance<
+    InferredProps,
+    CompleteBindings,
+    CompleteData,
+    CompleteComputed,
+    CompleteMethods,
+    CompleteEmits_Internal,
+    {}, // PublicProps
+    {}, // Defaults
+    false,
+    InjectOptions,
+    Slots,
+    Exposed,
+    TypeRefs,
+    TypeEl
+  >,
   PublicInstance = ComponentPublicInstance<
     InferredProps,
     CompleteBindings,

From 2fe3bfb46c0a85338544f5aa2faabe2d4e6791ba Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 14:55:19 +0800
Subject: [PATCH 034/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 137 ++++++++++++++----
 1 file changed, 109 insertions(+), 28 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index b91b417ae0a..9b17bf14592 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -379,7 +379,7 @@ export function defineComponent<
         $options: typeof options
       }
     >,
-): {
+): InferComponentOptions<{
   props?: PropsOptions
   emits?: IsNever<RuntimeEmitsOptions> extends true ? {} : RuntimeEmitsOptions
   components?: LocalComponents & GlobalComponents
@@ -398,33 +398,7 @@ export function defineComponent<
   __typeEmits?: TypeEmits
   __typeRefs?: TypeRefs
   __typeEl?: TypeEl
-  /**
-   * #3468
-   *
-   * type-only, used to assist Mixin's type inference,
-   * typescript will try to simplify the inferred `Mixin` type,
-   * with the `__differentiator`, typescript won't be able to combine different mixins,
-   * because the `__differentiator` will be different
-   */
-  __differentiator?: keyof Data | keyof Computed | keyof Methods
-  new (...args: any[]): PublicInstance
-} & Omit<
-  ComponentOptionsBase,
-  | 'props'
-  | 'emits'
-  | 'components'
-  | 'directives'
-  | 'slots'
-  | 'expose'
-  | 'computed'
-  | 'methods'
-  | 'provide'
-  | 'inject'
-  | 'mixins'
-  | 'extends'
-  | 'setup'
-  | 'data'
->
+}>
 
 // implementation, close to no-op
 /*! #__NO_SIDE_EFFECTS__ */
@@ -439,3 +413,110 @@ export function defineComponent(
         extend({ name: options.name }, extraOptions, { setup: options }))()
     : options
 }
+
+export type InferComponentOptions<T extends ComponentOptionsBase> = T extends {
+  props?: infer PropsOptions
+  emits?: infer RuntimeEmitsOptions
+  slots?: infer Slots
+  expose?: (infer Exposed)[]
+  computed?: infer Computed
+  methods?: infer Methods
+  mixins?: (infer Mixin)[]
+  extends?: infer Extends
+  setup?(): infer SetupBindings
+  data?(): infer Data
+  __typeProps?: infer TypeProps
+  __typeEmits?: infer TypeEmits
+  __typeRefs?: infer TypeRefs
+  __typeEl?: infer TypeEl
+}
+  ? T & {
+      /**
+       * #3468
+       *
+       * type-only, used to assist Mixin's type inference,
+       * typescript will try to simplify the inferred `Mixin` type,
+       * with the `__differentiator`, typescript won't be able to combine different mixins,
+       * because the `__differentiator` will be different
+       */
+      __differentiator?: keyof Data | keyof Computed | keyof Methods
+      new (...args: any[]): ComponentPublicInstance<
+        Readonly<
+          ExtractPropTypes<
+            ExtractMixinProps<Mixin> &
+              ExtractMixinProps<Extends> &
+              (unknown extends TypeProps
+                ? PropsOptions extends (infer Keys extends string)[]
+                  ? { [K in Keys]: null }
+                  : PropsOptions
+                : {})
+          > &
+            TypeProps &
+            EmitsToProps<
+              // CompleteEmits
+              ExtractMixinEmits<Mixin> &
+                ExtractMixinEmits<Extends> &
+                (unknown extends TypeEmits
+                  ? IsNever<RuntimeEmitsOptions> extends true
+                    ? {}
+                    : RuntimeEmitsOptions extends (infer Keys extends string)[]
+                      ? { [K in Keys]: (...args: any) => any }
+                      : RuntimeEmitsOptions
+                  : {}) &
+                TypeEmitsToOptions<TypeEmits & {}>
+            >
+        >,
+        ExtractMixinSetupBindings<Mixin> &
+          ExtractMixinSetupBindings<Extends> &
+          SetupBindings,
+        ExtractMixinData<Mixin> &
+          ExtractMixinData<Extends> &
+          EnsureNonVoid<Data>,
+        ExtractMixinComputed<Mixin> &
+          ExtractMixinComputed<Extends> &
+          Computed & {},
+        ExtractMixinMethods<Mixin> &
+          ExtractMixinMethods<Extends> &
+          Methods & {},
+        // CompleteEmits
+        ExtractMixinEmits<Mixin> &
+          ExtractMixinEmits<Extends> &
+          (unknown extends TypeEmits
+            ? IsNever<RuntimeEmitsOptions> extends true
+              ? {}
+              : RuntimeEmitsOptions extends (infer Keys extends string)[]
+                ? { [K in Keys]: (...args: any) => any }
+                : RuntimeEmitsOptions
+            : {}) &
+          TypeEmitsToOptions<TypeEmits & {}>,
+        PublicProps,
+        ExtractDefaultPropTypes<
+          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
+        >,
+        // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+        // user props types verbatim
+        unknown extends TypeProps ? true : false,
+        {}, // InjectOptions
+        Slots & {},
+        Exposed & string,
+        TypeRefs & {},
+        TypeEl & Element
+      >
+    } & Omit<
+        ComponentOptionsBase,
+        | 'props'
+        | 'emits'
+        | 'components'
+        | 'directives'
+        | 'slots'
+        | 'expose'
+        | 'computed'
+        | 'methods'
+        | 'provide'
+        | 'inject'
+        | 'mixins'
+        | 'extends'
+        | 'setup'
+        | 'data'
+      >
+  : never

From bcbf5f9d422c8829083a63b581d8deeecfff1d99 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 14:56:05 +0800
Subject: [PATCH 035/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 9b17bf14592..74e97e8005c 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -292,26 +292,6 @@ export function defineComponent<
     TypeRefs,
     TypeEl
   >,
-  PublicInstance = ComponentPublicInstance<
-    InferredProps,
-    CompleteBindings,
-    CompleteData,
-    CompleteComputed,
-    CompleteMethods,
-    CompleteEmits,
-    PublicProps,
-    ExtractDefaultPropTypes<
-      ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
-    >,
-    // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-    // user props types verbatim
-    unknown extends TypeProps ? true : false,
-    {}, // InjectOptions
-    Slots,
-    Exposed,
-    TypeRefs,
-    TypeEl
-  >,
 >(
   options: {
     props?:

From 0b002db68896bbcaa7c8e583bfe63b9d93680446 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 15:10:23 +0800
Subject: [PATCH 036/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts      |  2 +-
 packages/runtime-core/src/componentPublicInstance.ts | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 74e97e8005c..7a79f35f07b 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -355,7 +355,7 @@ export function defineComponent<
     | 'data'
   > &
     ThisType<
-      Omit<NoInfer<InternalInstance>, '$options'> & {
+      NoInfer<InternalInstance> & {
         $options: typeof options
       }
     >,
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index e6c99654279..46daa8fc683 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -35,7 +35,6 @@ import {
 } from '@vue/reactivity'
 import {
   type ComponentInjectOptions,
-  type ComponentOptionsBase,
   type ComponentProvideOptions,
   type ComputedOptions,
   type ExtractComputedReturns,
@@ -218,11 +217,10 @@ export type ComponentPublicInstance<
   $host: Element | null
   $emit: EmitFn<E>
   $el: TypeEl
-  $options: ComponentOptionsBase &
-    MergedComponentOptionsOverride & {
-      // allow any custom options
-      [key: string]: any
-    }
+  $options: MergedComponentOptionsOverride & {
+    // allow any custom options
+    [key: string]: any
+  }
   $forceUpdate: () => void
   $nextTick: typeof nextTick
   $watch<T extends string | ((...args: any) => any)>(

From 53347edc5ffad346cd031b82cc3c1965f542b10d Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 15:35:54 +0800
Subject: [PATCH 037/127] wip

---
 .../dts-test/defineComponent.test-d.tsx       |   8 -
 .../runtime-core/src/apiDefineComponent.ts    | 285 ++++++++----------
 2 files changed, 120 insertions(+), 173 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 1a3e46082f1..4152176b80c 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1638,15 +1638,11 @@ describe('expose typing', () => {
 })
 
 import type {
-  AllowedComponentProps,
-  ComponentCustomProps,
   ComponentInstance,
   DefineComponent,
   Directive,
-  ExtractPropTypes,
   KeepAliveProps,
   TransitionProps,
-  VNodeProps,
   vShow,
 } from 'vue'
 
@@ -1660,10 +1656,6 @@ declare const MyButton: DefineComponent<
   {},
   {},
   {},
-  {},
-  VNodeProps & AllowedComponentProps & ComponentCustomProps,
-  Readonly<ExtractPropTypes<{}>>,
-  {},
   {}
 >
 ;<MyButton class="x" />
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 7a79f35f07b..f3f91a6bcbb 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -33,7 +33,6 @@ import type {
 } from './componentProps'
 import type {
   ComponentPublicInstance,
-  ComponentPublicInstanceConstructor,
   CreateComponentPublicInstanceWithMixins,
   EnsureNonVoid,
   ExtractMixinComputed,
@@ -51,13 +50,6 @@ export type PublicProps = VNodeProps &
   AllowedComponentProps &
   ComponentCustomProps
 
-type ResolveProps<PropsOrPropOptions, E extends ObjectEmitsOptions> = Readonly<
-  PropsOrPropOptions extends ComponentPropsOptions
-    ? ExtractPropTypes<PropsOrPropOptions>
-    : PropsOrPropOptions
-> &
-  ({} extends E ? {} : EmitsToProps<E>)
-
 export type DefineComponent<
   PropsOrPropOptions = {},
   RawBindings = {},
@@ -66,40 +58,17 @@ export type DefineComponent<
   M extends MethodOptions = MethodOptions,
   Mixin = {},
   Extends = {},
-  E extends ObjectEmitsOptions = {},
-  PP = PublicProps,
-  Props = ResolveProps<PropsOrPropOptions, E>,
-  Defaults = ExtractDefaultPropTypes<PropsOrPropOptions>,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = ComponentPublicInstanceConstructor<
-  CreateComponentPublicInstanceWithMixins<
-    Props,
-    RawBindings,
-    D,
-    C,
-    M,
-    Mixin,
-    Extends,
-    E,
-    PP,
-    Defaults,
-    MakeDefaultsOptional,
-    {},
-    S,
-    LC & GlobalComponents,
-    Directives & GlobalDirectives,
-    Exposed,
-    TypeRefs,
-    TypeEl
-  >
-> & {
+> = InferComponentOptions<{
+  props?: PropsOrPropOptions extends ComponentPropsOptions
+    ? PropsOrPropOptions
+    : {}
   computed?: C
   methods?: M
   mixins?: Mixin[]
@@ -112,25 +81,119 @@ export type DefineComponent<
   provide?: Provide
   setup?: () => RawBindings
   data?: () => D
+  __typeProps?: PropsOrPropOptions extends ComponentPropsOptions
+    ? unknown
+    : PropsOrPropOptions
+  __typeRefs?: TypeRefs
+  __typeEl?: TypeEl
+}>
 
-  // allow any custom options
-  [key: string]: any
-} & Omit<
-    ComponentOptionsBase,
-    | 'computed'
-    | 'methods'
-    | 'mixins'
-    | 'extends'
-    | 'inject'
-    | 'slots'
-    | 'components'
-    | 'directives'
-    | 'expose'
-    | 'provide'
-    | 'setup'
-    | 'data'
-  > &
-  PP
+export type InferComponentOptions<T extends ComponentOptionsBase> = T extends {
+  props?: infer PropsOptions
+  emits?: infer RuntimeEmitsOptions
+  slots?: infer Slots
+  expose?: (infer Exposed)[]
+  computed?: infer Computed
+  methods?: infer Methods
+  mixins?: (infer Mixin)[]
+  extends?: infer Extends
+  setup?(): infer SetupBindings
+  data?(): infer Data
+  __typeProps?: infer TypeProps
+  __typeEmits?: infer TypeEmits
+  __typeRefs?: infer TypeRefs
+  __typeEl?: infer TypeEl
+}
+  ? T & {
+      /**
+       * #3468
+       *
+       * type-only, used to assist Mixin's type inference,
+       * typescript will try to simplify the inferred `Mixin` type,
+       * with the `__differentiator`, typescript won't be able to combine different mixins,
+       * because the `__differentiator` will be different
+       */
+      __differentiator?: keyof Data | keyof Computed | keyof Methods
+      new (...args: any[]): ComponentPublicInstance<
+        Readonly<
+          ExtractPropTypes<
+            ExtractMixinProps<Mixin> &
+              ExtractMixinProps<Extends> &
+              (unknown extends TypeProps
+                ? PropsOptions extends (infer Keys extends string)[]
+                  ? { [K in Keys]: null }
+                  : PropsOptions
+                : {})
+          > &
+            TypeProps &
+            EmitsToProps<
+              // CompleteEmits
+              ExtractMixinEmits<Mixin> &
+                ExtractMixinEmits<Extends> &
+                (unknown extends TypeEmits
+                  ? IsNever<RuntimeEmitsOptions> extends true
+                    ? {}
+                    : RuntimeEmitsOptions extends (infer Keys extends string)[]
+                      ? { [K in Keys]: (...args: any) => any }
+                      : RuntimeEmitsOptions
+                  : {}) &
+                TypeEmitsToOptions<TypeEmits & {}>
+            >
+        >,
+        ExtractMixinSetupBindings<Mixin> &
+          ExtractMixinSetupBindings<Extends> &
+          SetupBindings,
+        ExtractMixinData<Mixin> &
+          ExtractMixinData<Extends> &
+          EnsureNonVoid<Data>,
+        ExtractMixinComputed<Mixin> &
+          ExtractMixinComputed<Extends> &
+          Computed & {},
+        ExtractMixinMethods<Mixin> &
+          ExtractMixinMethods<Extends> &
+          Methods & {},
+        // CompleteEmits
+        ExtractMixinEmits<Mixin> &
+          ExtractMixinEmits<Extends> &
+          (unknown extends TypeEmits
+            ? IsNever<RuntimeEmitsOptions> extends true
+              ? {}
+              : RuntimeEmitsOptions extends (infer Keys extends string)[]
+                ? { [K in Keys]: (...args: any) => any }
+                : RuntimeEmitsOptions
+            : {}) &
+          TypeEmitsToOptions<TypeEmits & {}>,
+        PublicProps,
+        ExtractDefaultPropTypes<
+          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
+        >,
+        // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+        // user props types verbatim
+        unknown extends TypeProps ? true : false,
+        {}, // InjectOptions
+        Slots & {},
+        Exposed & string,
+        TypeRefs & {},
+        TypeEl & Element
+      >
+    } & Omit<
+        ComponentOptionsBase,
+        | 'props'
+        | 'emits'
+        | 'components'
+        | 'directives'
+        | 'slots'
+        | 'expose'
+        | 'computed'
+        | 'methods'
+        | 'provide'
+        | 'inject'
+        | 'mixins'
+        | 'extends'
+        | 'setup'
+        | 'data'
+      >
+  : never
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
@@ -354,11 +417,10 @@ export function defineComponent<
     | 'setup'
     | 'data'
   > &
-    ThisType<
-      NoInfer<InternalInstance> & {
-        $options: typeof options
-      }
-    >,
+    ThisType<NoInfer<InternalInstance>> &
+    ThisType<{
+      $options: typeof options
+    }>,
 ): InferComponentOptions<{
   props?: PropsOptions
   emits?: IsNever<RuntimeEmitsOptions> extends true ? {} : RuntimeEmitsOptions
@@ -393,110 +455,3 @@ export function defineComponent(
         extend({ name: options.name }, extraOptions, { setup: options }))()
     : options
 }
-
-export type InferComponentOptions<T extends ComponentOptionsBase> = T extends {
-  props?: infer PropsOptions
-  emits?: infer RuntimeEmitsOptions
-  slots?: infer Slots
-  expose?: (infer Exposed)[]
-  computed?: infer Computed
-  methods?: infer Methods
-  mixins?: (infer Mixin)[]
-  extends?: infer Extends
-  setup?(): infer SetupBindings
-  data?(): infer Data
-  __typeProps?: infer TypeProps
-  __typeEmits?: infer TypeEmits
-  __typeRefs?: infer TypeRefs
-  __typeEl?: infer TypeEl
-}
-  ? T & {
-      /**
-       * #3468
-       *
-       * type-only, used to assist Mixin's type inference,
-       * typescript will try to simplify the inferred `Mixin` type,
-       * with the `__differentiator`, typescript won't be able to combine different mixins,
-       * because the `__differentiator` will be different
-       */
-      __differentiator?: keyof Data | keyof Computed | keyof Methods
-      new (...args: any[]): ComponentPublicInstance<
-        Readonly<
-          ExtractPropTypes<
-            ExtractMixinProps<Mixin> &
-              ExtractMixinProps<Extends> &
-              (unknown extends TypeProps
-                ? PropsOptions extends (infer Keys extends string)[]
-                  ? { [K in Keys]: null }
-                  : PropsOptions
-                : {})
-          > &
-            TypeProps &
-            EmitsToProps<
-              // CompleteEmits
-              ExtractMixinEmits<Mixin> &
-                ExtractMixinEmits<Extends> &
-                (unknown extends TypeEmits
-                  ? IsNever<RuntimeEmitsOptions> extends true
-                    ? {}
-                    : RuntimeEmitsOptions extends (infer Keys extends string)[]
-                      ? { [K in Keys]: (...args: any) => any }
-                      : RuntimeEmitsOptions
-                  : {}) &
-                TypeEmitsToOptions<TypeEmits & {}>
-            >
-        >,
-        ExtractMixinSetupBindings<Mixin> &
-          ExtractMixinSetupBindings<Extends> &
-          SetupBindings,
-        ExtractMixinData<Mixin> &
-          ExtractMixinData<Extends> &
-          EnsureNonVoid<Data>,
-        ExtractMixinComputed<Mixin> &
-          ExtractMixinComputed<Extends> &
-          Computed & {},
-        ExtractMixinMethods<Mixin> &
-          ExtractMixinMethods<Extends> &
-          Methods & {},
-        // CompleteEmits
-        ExtractMixinEmits<Mixin> &
-          ExtractMixinEmits<Extends> &
-          (unknown extends TypeEmits
-            ? IsNever<RuntimeEmitsOptions> extends true
-              ? {}
-              : RuntimeEmitsOptions extends (infer Keys extends string)[]
-                ? { [K in Keys]: (...args: any) => any }
-                : RuntimeEmitsOptions
-            : {}) &
-          TypeEmitsToOptions<TypeEmits & {}>,
-        PublicProps,
-        ExtractDefaultPropTypes<
-          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
-        >,
-        // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-        // user props types verbatim
-        unknown extends TypeProps ? true : false,
-        {}, // InjectOptions
-        Slots & {},
-        Exposed & string,
-        TypeRefs & {},
-        TypeEl & Element
-      >
-    } & Omit<
-        ComponentOptionsBase,
-        | 'props'
-        | 'emits'
-        | 'components'
-        | 'directives'
-        | 'slots'
-        | 'expose'
-        | 'computed'
-        | 'methods'
-        | 'provide'
-        | 'inject'
-        | 'mixins'
-        | 'extends'
-        | 'setup'
-        | 'data'
-      >
-  : never

From d1ed7ca8d280847448d2980855b156d06bdc3baf Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 19 Feb 2025 16:47:37 +0800
Subject: [PATCH 038/127] wip

---
 .../dts-test/defineComponent.test-d.tsx       |  11 +-
 .../runtime-core/src/apiDefineComponent.ts    | 232 +++++++++---------
 2 files changed, 119 insertions(+), 124 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 4152176b80c..5dc7bac5a2a 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1648,16 +1648,7 @@ import type {
 
 // code generated by tsc / vue-tsc, make sure this continues to work
 // so we don't accidentally change the args order of DefineComponent
-declare const MyButton: DefineComponent<
-  {},
-  () => JSX.Element,
-  {},
-  {},
-  {},
-  {},
-  {},
-  {}
->
+declare const MyButton: DefineComponent<{}, () => JSX.Element>
 ;<MyButton class="x" />
 
 describe('__typeProps backdoor for union type for conditional props', () => {
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index f3f91a6bcbb..b5acc5c9e40 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -51,7 +51,7 @@ export type PublicProps = VNodeProps &
   ComponentCustomProps
 
 export type DefineComponent<
-  PropsOrPropOptions = {},
+  OptionsOrPropsOrPropOptions = {},
   RawBindings = {},
   D = {},
   C extends ComputedOptions = ComputedOptions,
@@ -65,118 +65,122 @@ export type DefineComponent<
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = InferComponentOptions<{
-  props?: PropsOrPropOptions extends ComponentPropsOptions
-    ? PropsOrPropOptions
-    : {}
-  computed?: C
-  methods?: M
-  mixins?: Mixin[]
-  extends?: Extends
-  inject?: {}
-  slots?: S
-  components?: LC & GlobalComponents
-  directives?: Directives & GlobalDirectives
-  expose?: Exposed[]
-  provide?: Provide
-  setup?: () => RawBindings
-  data?: () => D
-  __typeProps?: PropsOrPropOptions extends ComponentPropsOptions
-    ? unknown
-    : PropsOrPropOptions
-  __typeRefs?: TypeRefs
-  __typeEl?: TypeEl
-}>
+> = OptionsOrPropsOrPropOptions extends { props?: any }
+  ? InferComponentOptions<OptionsOrPropsOrPropOptions>
+  : InferComponentOptions<{
+      props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+        ? OptionsOrPropsOrPropOptions
+        : {}
+      computed?: C
+      methods?: M
+      mixins?: Mixin[]
+      extends?: Extends
+      inject?: {}
+      slots?: S
+      components?: LC & GlobalComponents
+      directives?: Directives & GlobalDirectives
+      expose?: Exposed[]
+      provide?: Provide
+      setup?: () => RawBindings
+      data?: () => D
+      __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+        ? unknown
+        : OptionsOrPropsOrPropOptions
+      __typeRefs?: TypeRefs
+      __typeEl?: TypeEl
+    }>
 
-export type InferComponentOptions<T extends ComponentOptionsBase> = T extends {
-  props?: infer PropsOptions
-  emits?: infer RuntimeEmitsOptions
-  slots?: infer Slots
-  expose?: (infer Exposed)[]
-  computed?: infer Computed
-  methods?: infer Methods
-  mixins?: (infer Mixin)[]
-  extends?: infer Extends
-  setup?(): infer SetupBindings
-  data?(): infer Data
-  __typeProps?: infer TypeProps
-  __typeEmits?: infer TypeEmits
-  __typeRefs?: infer TypeRefs
-  __typeEl?: infer TypeEl
-}
-  ? T & {
-      /**
-       * #3468
-       *
-       * type-only, used to assist Mixin's type inference,
-       * typescript will try to simplify the inferred `Mixin` type,
-       * with the `__differentiator`, typescript won't be able to combine different mixins,
-       * because the `__differentiator` will be different
-       */
-      __differentiator?: keyof Data | keyof Computed | keyof Methods
-      new (...args: any[]): ComponentPublicInstance<
-        Readonly<
-          ExtractPropTypes<
-            ExtractMixinProps<Mixin> &
-              ExtractMixinProps<Extends> &
-              (unknown extends TypeProps
-                ? PropsOptions extends (infer Keys extends string)[]
-                  ? { [K in Keys]: null }
-                  : PropsOptions
-                : {})
-          > &
-            TypeProps &
-            EmitsToProps<
-              // CompleteEmits
-              ExtractMixinEmits<Mixin> &
-                ExtractMixinEmits<Extends> &
-                (unknown extends TypeEmits
-                  ? IsNever<RuntimeEmitsOptions> extends true
-                    ? {}
-                    : RuntimeEmitsOptions extends (infer Keys extends string)[]
-                      ? { [K in Keys]: (...args: any) => any }
-                      : RuntimeEmitsOptions
-                  : {}) &
-                TypeEmitsToOptions<TypeEmits & {}>
-            >
-        >,
-        ExtractMixinSetupBindings<Mixin> &
-          ExtractMixinSetupBindings<Extends> &
-          SetupBindings,
-        ExtractMixinData<Mixin> &
-          ExtractMixinData<Extends> &
-          EnsureNonVoid<Data>,
-        ExtractMixinComputed<Mixin> &
-          ExtractMixinComputed<Extends> &
-          Computed & {},
-        ExtractMixinMethods<Mixin> &
-          ExtractMixinMethods<Extends> &
-          Methods & {},
-        // CompleteEmits
-        ExtractMixinEmits<Mixin> &
-          ExtractMixinEmits<Extends> &
-          (unknown extends TypeEmits
-            ? IsNever<RuntimeEmitsOptions> extends true
-              ? {}
-              : RuntimeEmitsOptions extends (infer Keys extends string)[]
-                ? { [K in Keys]: (...args: any) => any }
-                : RuntimeEmitsOptions
-            : {}) &
-          TypeEmitsToOptions<TypeEmits & {}>,
-        PublicProps,
-        ExtractDefaultPropTypes<
-          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
-        >,
-        // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-        // user props types verbatim
-        unknown extends TypeProps ? true : false,
-        {}, // InjectOptions
-        Slots & {},
-        Exposed & string,
-        TypeRefs & {},
-        TypeEl & Element
-      >
-    } & Omit<
+type InferComponentOptions<T> = T &
+  (T extends {
+    props?: infer PropsOptions
+    emits?: infer RuntimeEmitsOptions
+    slots?: infer Slots
+    expose?: (infer Exposed)[]
+    computed?: infer Computed
+    methods?: infer Methods
+    mixins?: (infer Mixin)[]
+    extends?: infer Extends
+    setup?(): infer SetupBindings
+    data?(): infer Data
+    __typeProps?: infer TypeProps
+    __typeEmits?: infer TypeEmits
+    __typeRefs?: infer TypeRefs
+    __typeEl?: infer TypeEl
+  }
+    ? {
+        /**
+         * #3468
+         *
+         * type-only, used to assist Mixin's type inference,
+         * typescript will try to simplify the inferred `Mixin` type,
+         * with the `__differentiator`, typescript won't be able to combine different mixins,
+         * because the `__differentiator` will be different
+         */
+        __differentiator?: keyof Data | keyof Computed | keyof Methods
+        new (...args: any[]): ComponentPublicInstance<
+          Readonly<
+            ExtractPropTypes<
+              ExtractMixinProps<Mixin> &
+                ExtractMixinProps<Extends> &
+                (unknown extends TypeProps
+                  ? PropsOptions extends (infer Keys extends string)[]
+                    ? { [K in Keys]: null }
+                    : PropsOptions
+                  : {})
+            > &
+              TypeProps &
+              EmitsToProps<
+                // CompleteEmits
+                ExtractMixinEmits<Mixin> &
+                  ExtractMixinEmits<Extends> &
+                  (unknown extends TypeEmits
+                    ? IsNever<RuntimeEmitsOptions> extends true
+                      ? {}
+                      : RuntimeEmitsOptions extends (infer Keys extends
+                            string)[]
+                        ? { [K in Keys]: (...args: any) => any }
+                        : RuntimeEmitsOptions
+                    : {}) &
+                  TypeEmitsToOptions<TypeEmits & {}>
+              >
+          >,
+          ExtractMixinSetupBindings<Mixin> &
+            ExtractMixinSetupBindings<Extends> &
+            SetupBindings,
+          ExtractMixinData<Mixin> &
+            ExtractMixinData<Extends> &
+            EnsureNonVoid<Data>,
+          ExtractMixinComputed<Mixin> &
+            ExtractMixinComputed<Extends> &
+            Computed & {},
+          ExtractMixinMethods<Mixin> &
+            ExtractMixinMethods<Extends> &
+            Methods & {},
+          // CompleteEmits
+          ExtractMixinEmits<Mixin> &
+            ExtractMixinEmits<Extends> &
+            (unknown extends TypeEmits
+              ? IsNever<RuntimeEmitsOptions> extends true
+                ? {}
+                : RuntimeEmitsOptions extends (infer Keys extends string)[]
+                  ? { [K in Keys]: (...args: any) => any }
+                  : RuntimeEmitsOptions
+              : {}) &
+            TypeEmitsToOptions<TypeEmits & {}>,
+          PublicProps,
+          ExtractDefaultPropTypes<
+            ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
+          >,
+          // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+          // user props types verbatim
+          unknown extends TypeProps ? true : false,
+          {}, // InjectOptions
+          Slots & {},
+          Exposed & string,
+          TypeRefs & {},
+          TypeEl & Element
+        >
+      } & Omit<
         ComponentOptionsBase,
         | 'props'
         | 'emits'
@@ -193,7 +197,7 @@ export type InferComponentOptions<T extends ComponentOptionsBase> = T extends {
         | 'setup'
         | 'data'
       >
-  : never
+    : {})
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
@@ -421,7 +425,7 @@ export function defineComponent<
     ThisType<{
       $options: typeof options
     }>,
-): InferComponentOptions<{
+): DefineComponent<{
   props?: PropsOptions
   emits?: IsNever<RuntimeEmitsOptions> extends true ? {} : RuntimeEmitsOptions
   components?: LocalComponents & GlobalComponents

From fe6f3bc7a3a05d73ec1bb30871f124393949d9c3 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 20 Feb 2025 15:47:21 +0800
Subject: [PATCH 039/127] wip [skip ci]

---
 packages/runtime-dom/src/apiCustomElement.ts | 37 ++++++++++----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index a7a844cc6d5..e49f5008336 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -86,12 +86,9 @@ export function defineCustomElement<Props, RawBindings = object>(
 // overload 2: defineCustomElement with options object, infer props from options
 export function defineCustomElement<
   // props
-  RuntimePropsOptions extends
-    ComponentObjectPropsOptions = ComponentObjectPropsOptions,
-  PropsKeys extends string = string,
+  RuntimePropsOptions extends ComponentObjectPropsOptions = {},
   // emits
   RuntimeEmitsOptions extends ObjectEmitsOptions = {},
-  EmitsKeys extends string = string,
   // other options
   Data = {},
   SetupBindings = {},
@@ -100,21 +97,19 @@ export function defineCustomElement<
   Mixin = {},
   Extends = {},
   InjectOptions extends ComponentInjectOptions = {},
-  InjectKeys extends string = string,
   Slots extends SlotsType = {},
   LocalComponents extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
+  // assisted input types
+  _PropsKeys extends string = string,
+  _EmitsKeys extends string = string,
+  _InjectKeys extends string = string,
   // resolved types
-  ResolvedRuntimeEmitsOptions extends EmitsOptions = string extends EmitsKeys
-    ? RuntimeEmitsOptions
-    : EmitsKeys[],
-  InferredProps = string extends PropsKeys
-    ? ComponentObjectPropsOptions extends RuntimePropsOptions
-      ? {}
-      : ExtractPropTypes<RuntimePropsOptions>
-    : { [key in PropsKeys]?: any },
+  InferredProps = RuntimePropsOptions extends (infer Keys extends string)[]
+    ? { [K in Keys]?: any }
+    : ExtractPropTypes<RuntimePropsOptions>,
   ResolvedProps = InferredProps & EmitsToProps<RuntimeEmitsOptions>,
   PublicP = ResolvedProps &
     Prettify<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>,
@@ -129,13 +124,19 @@ export function defineCustomElement<
   >,
 >(
   options: CustomElementOptions & {
-    props?: (RuntimePropsOptions & ThisType<void>) | PropsKeys[]
-    emits?: (RuntimeEmitsOptions & ThisType<void>) | EmitsKeys[]
+    props?:
+      | ComponentObjectPropsOptions
+      | (RuntimePropsOptions & ThisType<void>)
+      | _PropsKeys[]
+    emits?:
+      | ObjectEmitsOptions
+      | (RuntimeEmitsOptions & ThisType<void>)
+      | _EmitsKeys[]
     computed?: Computed
     methods?: Methods
     mixins?: Mixin[]
     extends?: Extends
-    inject?: string extends InjectKeys ? InjectOptions : InjectKeys[]
+    inject?: ComponentInjectOptions | InjectOptions | _InjectKeys[]
     slots?: Slots
     components?: LocalComponents
     directives?: Directives
@@ -144,7 +145,7 @@ export function defineCustomElement<
     setup?: (
       this: void,
       props: NoInfer<LooseRequired<PublicP>>,
-      ctx: NoInfer<SetupContext<ResolvedRuntimeEmitsOptions, Slots>>,
+      ctx: NoInfer<SetupContext<RuntimeEmitsOptions, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
     data?: (this: DataVM, vm: DataVM) => Data
 
@@ -177,7 +178,7 @@ export function defineCustomElement<
         Mixin,
         Extends,
         RuntimeEmitsOptions,
-        EmitsKeys,
+        _EmitsKeys,
         {},
         false,
         InjectOptions,

From 6ba96d13153ce4763db575096f0549630d5e0b34 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 20 Feb 2025 18:47:00 +0800
Subject: [PATCH 040/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts | 13 ++++++-------
 packages/runtime-core/src/componentEmits.ts     |  4 +---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index b5acc5c9e40..388ee0a61de 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -11,7 +11,6 @@ import type {
 import type {
   EmitsOptions,
   EmitsToProps,
-  IsNever,
   ObjectEmitsOptions,
   TypeEmitsToOptions,
 } from './componentEmits'
@@ -134,7 +133,7 @@ type InferComponentOptions<T> = T &
                 ExtractMixinEmits<Mixin> &
                   ExtractMixinEmits<Extends> &
                   (unknown extends TypeEmits
-                    ? IsNever<RuntimeEmitsOptions> extends true
+                    ? string[] extends RuntimeEmitsOptions
                       ? {}
                       : RuntimeEmitsOptions extends (infer Keys extends
                             string)[]
@@ -160,7 +159,7 @@ type InferComponentOptions<T> = T &
           ExtractMixinEmits<Mixin> &
             ExtractMixinEmits<Extends> &
             (unknown extends TypeEmits
-              ? IsNever<RuntimeEmitsOptions> extends true
+              ? string[] extends RuntimeEmitsOptions
                 ? {}
                 : RuntimeEmitsOptions extends (infer Keys extends string)[]
                   ? { [K in Keys]: (...args: any) => any }
@@ -271,7 +270,7 @@ export function defineComponent<
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
   PropsOptions extends ComponentPropsOptions = {},
-  RuntimeEmitsOptions extends EmitsOptions = never,
+  RuntimeEmitsOptions extends EmitsOptions = string[],
   InjectOptions extends ComponentInjectOptions = {},
   Data = {},
   SetupBindings = {},
@@ -311,7 +310,7 @@ export function defineComponent<
   CompleteEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
     (unknown extends TypeEmits
-      ? IsNever<RuntimeEmitsOptions> extends true
+      ? string[] extends RuntimeEmitsOptions
         ? {}
         : RuntimeEmitsOptions extends (infer Keys extends string)[]
           ? { [K in Keys]: (...args: any) => any }
@@ -319,7 +318,7 @@ export function defineComponent<
       : {}) &
     TypeEmitsToOptions<TypeEmits & {}>,
   CompleteEmits_Internal extends EmitsOptions = unknown extends TypeEmits
-    ? IsNever<RuntimeEmitsOptions> extends true
+    ? string[] extends RuntimeEmitsOptions
       ? string[]
       : CompleteEmits
     : CompleteEmits,
@@ -427,7 +426,7 @@ export function defineComponent<
     }>,
 ): DefineComponent<{
   props?: PropsOptions
-  emits?: IsNever<RuntimeEmitsOptions> extends true ? {} : RuntimeEmitsOptions
+  emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
   components?: LocalComponents & GlobalComponents
   directives?: Directives & GlobalDirectives
   slots?: Slots
diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
index e0fef8a8262..4344e3c0ddf 100644
--- a/packages/runtime-core/src/componentEmits.ts
+++ b/packages/runtime-core/src/componentEmits.ts
@@ -83,8 +83,6 @@ type IsStringLiteral<T> = T extends string
     : true
   : false
 
-export type IsNever<T> = [T] extends [never] ? true : false
-
 export type ShortEmitsToObject<E> =
   E extends Record<string, any[]>
     ? {
@@ -98,7 +96,7 @@ export type EmitFn<
 > =
   Options extends Array<infer V>
     ? (event: V, ...args: any[]) => void
-    : IsNever<Event> extends true
+    : string[] extends Event
       ? {}
       : UnionToIntersection<
           {

From 244f6c1202686b9dbcd5ab6415719df92fbe33b2 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 20 Feb 2025 18:54:33 +0800
Subject: [PATCH 041/127] wip

---
 .../runtime-core/__tests__/apiOptions.spec.ts | 14 +++++-----
 .../runtime-core/src/apiDefineComponent.ts    | 27 +++++--------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/packages/runtime-core/__tests__/apiOptions.spec.ts b/packages/runtime-core/__tests__/apiOptions.spec.ts
index 2a1ec704cbf..349afda6e1c 100644
--- a/packages/runtime-core/__tests__/apiOptions.spec.ts
+++ b/packages/runtime-core/__tests__/apiOptions.spec.ts
@@ -84,6 +84,13 @@ describe('api: options', () => {
 
   test('methods', async () => {
     const Comp = defineComponent({
+      data() {
+        // #3300 method on ctx should be overwritable
+        this.incBy = this.incBy.bind(this, 2)
+        return {
+          foo: 1,
+        }
+      },
       methods: {
         inc() {
           this.foo++
@@ -92,13 +99,6 @@ describe('api: options', () => {
           this.foo += n
         },
       },
-      data() {
-        // #3300 method on ctx should be overwritable
-        this.incBy = this.incBy.bind(this, 2)
-        return {
-          foo: 1,
-        }
-      },
       render() {
         return h(
           'div',
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 388ee0a61de..5f89bc14bd9 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -326,22 +326,6 @@ export function defineComponent<
     ExtractPropTypes<CompleteProps> & TypeProps & EmitsToProps<CompleteEmits>
   >,
   // instance types
-  DataVM = ComponentPublicInstance<
-    InferredProps,
-    CompleteBindings,
-    CompleteData,
-    CompleteComputed,
-    CompleteMethods,
-    CompleteEmits_Internal,
-    {}, // PublicProps
-    {}, // Defaults
-    false,
-    InjectOptions,
-    Slots,
-    Exposed,
-    TypeRefs,
-    TypeEl
-  >,
   InternalInstance = ComponentPublicInstance<
     InferredProps,
     CompleteBindings,
@@ -383,7 +367,7 @@ export function defineComponent<
       props: NoInfer<LooseRequired<InferredProps>>,
       ctx: NoInfer<SetupContext<CompleteEmits_Internal, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
-    data?: (this: NoInfer<DataVM>, vm: NoInfer<DataVM>) => Data
+    data?: (vm: NoInfer<InternalInstance>) => Data
     /**
      * @private for language-tools use only
      */
@@ -420,10 +404,11 @@ export function defineComponent<
     | 'setup'
     | 'data'
   > &
-    ThisType<NoInfer<InternalInstance>> &
-    ThisType<{
-      $options: typeof options
-    }>,
+    ThisType<
+      NoInfer<InternalInstance> & {
+        $options: typeof options
+      }
+    >,
 ): DefineComponent<{
   props?: PropsOptions
   emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions

From 40b1360fc6036fada822ad18c240fc838b48ec1d Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 20 Feb 2025 19:21:41 +0800
Subject: [PATCH 042/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 5f89bc14bd9..50290e4b26a 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -264,7 +264,6 @@ export function defineComponent<
 
 // overload 2: defineComponent with options object, infer props from options
 export function defineComponent<
-  // input inference
   TypeProps,
   TypeEmits extends ComponentTypeEmits | unknown = unknown,
   TypeRefs extends Record<string, unknown> = {},
@@ -283,30 +282,18 @@ export function defineComponent<
   Directives extends Record<string, Directive> = {},
   Provide extends ComponentProvideOptions = {},
   Exposed extends string = string,
-  // assisted input types
+  // assisted input inference
   _PropsKeys extends string = string,
   _EmitsKeys extends string = string,
   _InjectKeys extends string = string,
-  // merged types
-  CompleteProps = ExtractMixinProps<Mixin> &
+  // resolved types
+  ResolvedProps = ExtractMixinProps<Mixin> &
     ExtractMixinProps<Extends> &
     (unknown extends TypeProps
       ? PropsOptions extends (infer Keys extends string)[]
         ? { [K in Keys]: null }
         : PropsOptions
       : {}),
-  CompleteBindings = ExtractMixinSetupBindings<Mixin> &
-    ExtractMixinSetupBindings<Extends> &
-    SetupBindings,
-  CompleteData = ExtractMixinData<Mixin> &
-    ExtractMixinData<Extends> &
-    EnsureNonVoid<Data>,
-  CompleteComputed extends ComputedOptions = ExtractMixinComputed<Mixin> &
-    ExtractMixinComputed<Extends> &
-    Computed,
-  CompleteMethods extends MethodOptions = ExtractMixinMethods<Mixin> &
-    ExtractMixinMethods<Extends> &
-    Methods,
   CompleteEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
     (unknown extends TypeEmits
@@ -323,15 +310,16 @@ export function defineComponent<
       : CompleteEmits
     : CompleteEmits,
   InferredProps = Readonly<
-    ExtractPropTypes<CompleteProps> & TypeProps & EmitsToProps<CompleteEmits>
+    ExtractPropTypes<ResolvedProps> & TypeProps & EmitsToProps<CompleteEmits>
   >,
-  // instance types
   InternalInstance = ComponentPublicInstance<
     InferredProps,
-    CompleteBindings,
-    CompleteData,
-    CompleteComputed,
-    CompleteMethods,
+    ExtractMixinSetupBindings<Mixin> &
+      ExtractMixinSetupBindings<Extends> &
+      SetupBindings,
+    ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<Data>,
+    ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
+    ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
     CompleteEmits_Internal,
     {}, // PublicProps
     {}, // Defaults

From 18da56d80362f2fa0bb09a6fe66a8c1ca9bf62ac Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Sun, 23 Feb 2025 13:19:58 +0800
Subject: [PATCH 043/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 50290e4b26a..3b67544cd2d 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -129,7 +129,7 @@ type InferComponentOptions<T> = T &
             > &
               TypeProps &
               EmitsToProps<
-                // CompleteEmits
+                // ResolvedEmits
                 ExtractMixinEmits<Mixin> &
                   ExtractMixinEmits<Extends> &
                   (unknown extends TypeEmits
@@ -155,7 +155,7 @@ type InferComponentOptions<T> = T &
           ExtractMixinMethods<Mixin> &
             ExtractMixinMethods<Extends> &
             Methods & {},
-          // CompleteEmits
+          // ResolvedEmits
           ExtractMixinEmits<Mixin> &
             ExtractMixinEmits<Extends> &
             (unknown extends TypeEmits
@@ -294,7 +294,7 @@ export function defineComponent<
         ? { [K in Keys]: null }
         : PropsOptions
       : {}),
-  CompleteEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
+  ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
     (unknown extends TypeEmits
       ? string[] extends RuntimeEmitsOptions
@@ -304,13 +304,13 @@ export function defineComponent<
           : RuntimeEmitsOptions
       : {}) &
     TypeEmitsToOptions<TypeEmits & {}>,
-  CompleteEmits_Internal extends EmitsOptions = unknown extends TypeEmits
+  ResolvedEmits_Internal extends EmitsOptions = unknown extends TypeEmits
     ? string[] extends RuntimeEmitsOptions
       ? string[]
-      : CompleteEmits
-    : CompleteEmits,
+      : ResolvedEmits
+    : ResolvedEmits,
   InferredProps = Readonly<
-    ExtractPropTypes<ResolvedProps> & TypeProps & EmitsToProps<CompleteEmits>
+    ExtractPropTypes<ResolvedProps> & TypeProps & EmitsToProps<ResolvedEmits>
   >,
   InternalInstance = ComponentPublicInstance<
     InferredProps,
@@ -320,7 +320,7 @@ export function defineComponent<
     ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<Data>,
     ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
     ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
-    CompleteEmits_Internal,
+    ResolvedEmits_Internal,
     {}, // PublicProps
     {}, // Defaults
     false,
@@ -353,7 +353,7 @@ export function defineComponent<
     setup?: (
       this: void,
       props: NoInfer<LooseRequired<InferredProps>>,
-      ctx: NoInfer<SetupContext<CompleteEmits_Internal, Slots>>,
+      ctx: NoInfer<SetupContext<ResolvedEmits_Internal, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
     data?: (vm: NoInfer<InternalInstance>) => Data
     /**

From b78953f8402682f8368d16ed586eb3214bdc3f16 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Sun, 23 Feb 2025 13:45:32 +0800
Subject: [PATCH 044/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 3b67544cd2d..03b90c0aaea 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -287,13 +287,6 @@ export function defineComponent<
   _EmitsKeys extends string = string,
   _InjectKeys extends string = string,
   // resolved types
-  ResolvedProps = ExtractMixinProps<Mixin> &
-    ExtractMixinProps<Extends> &
-    (unknown extends TypeProps
-      ? PropsOptions extends (infer Keys extends string)[]
-        ? { [K in Keys]: null }
-        : PropsOptions
-      : {}),
   ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
     (unknown extends TypeEmits
@@ -310,7 +303,17 @@ export function defineComponent<
       : ResolvedEmits
     : ResolvedEmits,
   InferredProps = Readonly<
-    ExtractPropTypes<ResolvedProps> & TypeProps & EmitsToProps<ResolvedEmits>
+    ExtractPropTypes<
+      ExtractMixinProps<Mixin> &
+        ExtractMixinProps<Extends> &
+        (unknown extends TypeProps
+          ? PropsOptions extends (infer Keys extends string)[]
+            ? { [K in Keys]: null }
+            : PropsOptions
+          : {})
+    > &
+      TypeProps &
+      EmitsToProps<ResolvedEmits>
   >,
   InternalInstance = ComponentPublicInstance<
     InferredProps,

From 6d0acae94eb17ee9c8ed0bcd3234bc40c4b9452d Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 13:52:14 +0800
Subject: [PATCH 045/127] wip [skip ci]

---
 .../dts-test/defineComponent.test-d.tsx       |  57 ++-
 .../runtime-core/__tests__/apiOptions.spec.ts |  11 +-
 .../runtime-core/src/apiDefineComponent.ts    |  38 +-
 packages/runtime-core/src/apiSetupHelpers.ts  |  16 +-
 packages/runtime-core/src/componentOptions.ts | 408 +++++++++++++++---
 packages/runtime-core/src/index.ts            |   1 +
 packages/runtime-dom/src/apiCustomElement.ts  |  20 +-
 7 files changed, 419 insertions(+), 132 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index 5dc7bac5a2a..cf9aa67449f 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -1901,8 +1901,61 @@ declare const ErrorMessage: {
   __isFragment?: never
   __isTeleport?: never
   __isSuspense?: never
-} & vue.ComponentOptionsBase &
-  vue.PublicProps &
+} & vue.ComponentOptionsBase<
+  Readonly<
+    vue.ExtractPropTypes<{
+      as: {
+        type: StringConstructor
+        default: any
+      }
+      name: {
+        type: StringConstructor
+        required: true
+      }
+    }>
+  >,
+  () =>
+    | VNode<
+        vue.RendererNode,
+        vue.RendererElement,
+        {
+          [key: string]: any
+        }
+      >
+    | vue.Slot<any>
+    | VNode<
+        vue.RendererNode,
+        vue.RendererElement,
+        {
+          [key: string]: any
+        }
+      >[]
+    | {
+        default: () => VNode<
+          vue.RendererNode,
+          vue.RendererElement,
+          {
+            [key: string]: any
+          }
+        >[]
+      },
+  unknown,
+  {},
+  {},
+  {},
+  {},
+  {},
+  string,
+  {
+    as: string
+  },
+  {},
+  string,
+  {}
+> &
+  vue.VNodeProps &
+  vue.AllowedComponentProps &
+  vue.ComponentCustomProps &
   (new () => {
     $slots: {
       default: (arg: ErrorMessageSlotProps) => VNode[]
diff --git a/packages/runtime-core/__tests__/apiOptions.spec.ts b/packages/runtime-core/__tests__/apiOptions.spec.ts
index 349afda6e1c..fc942bbe054 100644
--- a/packages/runtime-core/__tests__/apiOptions.spec.ts
+++ b/packages/runtime-core/__tests__/apiOptions.spec.ts
@@ -3,7 +3,7 @@
  */
 import type { Mock } from 'vitest'
 import {
-  type ComponentOptionsBase,
+  type ComponentOptions,
   type TestElement,
   computed,
   createApp,
@@ -1415,9 +1415,8 @@ describe('api: options', () => {
     })
 
     test('computed with setter and no getter', () => {
-      const Comp: ComponentOptionsBase = {
+      const Comp: ComponentOptions = {
         computed: {
-          // @ts-expect-error
           foo: {
             set() {},
           },
@@ -1432,9 +1431,8 @@ describe('api: options', () => {
 
     test('assigning to computed with no setter', () => {
       let instance: any
-      const Comp: ComponentOptionsBase = {
+      const Comp: ComponentOptions = {
         computed: {
-          // @ts-expect-error
           foo: {
             get() {},
           },
@@ -1485,9 +1483,8 @@ describe('api: options', () => {
     })
 
     test('methods property is not a function', () => {
-      const Comp: ComponentOptionsBase = {
+      const Comp: ComponentOptions = {
         methods: {
-          // @ts-expect-error
           foo: 1,
         },
         render() {},
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 03b90c0aaea..e58f109a340 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -17,8 +17,8 @@ import type {
 import type {
   ComponentInjectOptions,
   ComponentOptions,
-  ComponentOptionsBase,
   ComponentProvideOptions,
+  ComponentStaticOptions,
   ComputedOptions,
   MethodOptions,
   ObjectInjectOptions,
@@ -179,23 +179,7 @@ type InferComponentOptions<T> = T &
           TypeRefs & {},
           TypeEl & Element
         >
-      } & Omit<
-        ComponentOptionsBase,
-        | 'props'
-        | 'emits'
-        | 'components'
-        | 'directives'
-        | 'slots'
-        | 'expose'
-        | 'computed'
-        | 'methods'
-        | 'provide'
-        | 'inject'
-        | 'mixins'
-        | 'extends'
-        | 'setup'
-        | 'data'
-      >
+      } & ComponentStaticOptions
     : {})
 
 export type DefineSetupFnComponent<
@@ -378,23 +362,7 @@ export function defineComponent<
 
     // allow any custom options
     [key: string]: any
-  } & Omit<
-    ComponentOptionsBase,
-    | 'props'
-    | 'emits'
-    | 'components'
-    | 'directives'
-    | 'slots'
-    | 'expose'
-    | 'computed'
-    | 'methods'
-    | 'provide'
-    | 'inject'
-    | 'mixins'
-    | 'extends'
-    | 'setup'
-    | 'data'
-  > &
+  } & ComponentStaticOptions &
     ThisType<
       NoInfer<InternalInstance> & {
         $options: typeof options
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index ef043c16279..6aa3d70b570 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -17,7 +17,7 @@ import {
 } from './component'
 import type { EmitFn, EmitsOptions, ObjectEmitsOptions } from './componentEmits'
 import type {
-  ComponentOptionsBase,
+  ComponentStaticOptions,
   ComputedOptions,
   MethodOptions,
 } from './componentOptions'
@@ -230,19 +230,7 @@ export function defineOptions<
      * slots should be defined via defineSlots().
      */
     slots?: never
-  } & Omit<
-    ComponentOptionsBase,
-    | 'computed'
-    | 'methods'
-    | 'mixins'
-    | 'extends'
-    | 'data'
-    | 'setup'
-    | 'props'
-    | 'emits'
-    | 'expose'
-    | 'slots'
-  >,
+  } & ComponentStaticOptions,
 ): void {
   if (__DEV__) {
     warnRuntimeUsage(`defineOptions`)
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index fca4439eaf1..361d77fb767 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -49,8 +49,17 @@ import {
   type WritableComputedOptions,
   reactive,
 } from '@vue/reactivity'
-import type { ComponentPropsOptions } from './componentProps'
-import type { EmitsOptions, ObjectEmitsOptions } from './componentEmits'
+import type {
+  ComponentObjectPropsOptions,
+  ComponentPropsOptions,
+  ExtractDefaultPropTypes,
+  ExtractPropTypes,
+} from './componentProps'
+import type {
+  EmitsOptions,
+  EmitsToProps,
+  TypeEmitsToOptions,
+} from './componentEmits'
 import type { Directive } from './directives'
 import {
   type ComponentPublicInstance,
@@ -71,7 +80,7 @@ import {
 import type { OptionMergeFunction } from './apiCreateApp'
 import { LifecycleHooks } from './enums'
 import type { SlotsType } from './componentSlots'
-import { normalizePropsOrEmits } from './apiSetupHelpers'
+import { ComponentTypeEmits, normalizePropsOrEmits } from './apiSetupHelpers'
 import { markAsyncBoundary } from './helpers/useId'
 
 /**
@@ -94,11 +103,52 @@ export interface ComponentCustomOptions {}
 
 export type RenderFunction = () => VNodeChild
 
-export interface ComponentOptionsBase
-  extends LegacyOptions,
+export type ComponentStaticOptions = Omit<
+  ComponentOptionsBase<{}, {}, {}, {}, {}, {}, {}, {}>,
+  | 'props'
+  | 'emits'
+  | 'components'
+  | 'directives'
+  | 'slots'
+  | 'expose'
+  | 'computed'
+  | 'methods'
+  | 'provide'
+  | 'inject'
+  | 'mixins'
+  | 'extends'
+  | 'setup'
+  | 'data'
+>
+
+export interface ComponentOptionsBase<
+  Props,
+  RawBindings,
+  D,
+  C extends ComputedOptions,
+  M extends MethodOptions,
+  Mixin,
+  Extends,
+  E extends EmitsOptions,
+  EE extends string = string,
+  Defaults = {},
+  I extends ComponentInjectOptions = {},
+  II extends string = string,
+  S extends SlotsType = {},
+  LC extends Record<string, Component> = {},
+  Directives extends Record<string, Directive> = {},
+  Exposed extends string = string,
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
+> extends LegacyOptions<Props, D, C, M, Mixin, Extends, I, II, Provide>,
     ComponentInternalOptions,
     ComponentCustomOptions {
-  setup?: (props: any, ctx: SetupContext) => any
+  setup?: (
+    this: void,
+    props: LooseRequired<
+      Props & Prettify<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+    >,
+    ctx: SetupContext<E, S>,
+  ) => Promise<RawBindings> | RawBindings | RenderFunction | void
   name?: string
   template?: string | object // can be a direct DOM node
   // Note: we are intentionally using the signature-less `Function` type here
@@ -109,14 +159,14 @@ export interface ComponentOptionsBase
   render?: Function
   // NOTE: extending both LC and Record<string, Component> allows objects to be forced
   // to be of type Component, while still inferring LC generic
-  components?: Record<string, Component>
+  components?: LC & Record<string, Component>
   // NOTE: extending both Directives and Record<string, Directive> allows objects to be forced
   // to be of type Directive, while still inferring Directives generic
-  directives?: Record<string, Directive>
+  directives?: Directives & Record<string, Directive>
   inheritAttrs?: boolean
-  emits?: EmitsOptions
-  slots?: SlotsType
-  expose?: string[]
+  emits?: (E | EE[]) & ThisType<void>
+  slots?: S
+  expose?: Exposed[]
   serverPrefetch?(): void | Promise<any>
 
   // Runtime compiler only -----------------------------------------------------
@@ -181,7 +231,7 @@ export interface ComponentOptionsBase
   __isTeleport?: never
   __isSuspense?: never
 
-  __defaults?: any
+  __defaults?: Defaults
 }
 
 /**
@@ -200,9 +250,10 @@ export type ComponentOptions<
   D = any,
   C extends ComputedOptions = any,
   M extends MethodOptions = any,
-  Mixin = any,
-  Extends = any,
-  E extends ObjectEmitsOptions = any,
+  Mixin = {},
+  Extends = {},
+  E extends EmitsOptions = any,
+  EE extends string = string,
   Defaults = {},
   I extends ComponentInjectOptions = {},
   II extends string = string,
@@ -211,41 +262,28 @@ export type ComponentOptions<
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  DataVM = CreateComponentPublicInstanceWithMixins<
-    Props,
-    {},
-    {},
-    {},
-    MethodOptions,
-    Mixin,
-    Extends
-  >,
-> = {
-  computed?: C
-  methods?: M
-  mixins?: Mixin[]
-  extends?: Extends
-  inject?: string extends II ? I : II[]
-  slots?: S
-  components?: LC
-  directives?: Directives
-  expose?: Exposed[]
-  provide?: Provide
-  setup?: (
-    this: void,
-    props: NoInfer<
-      LooseRequired<
-        Props & Prettify<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
-      >
-    >,
-    ctx: NoInfer<SetupContext<E, S>>,
-  ) => Promise<RawBindings> | RawBindings | RenderFunction | void
-  data?: (this: DataVM, vm: DataVM) => D
-
+> = ComponentOptionsBase<
+  Props,
+  RawBindings,
+  D,
+  C,
+  M,
+  Mixin,
+  Extends,
+  E,
+  EE,
+  Defaults,
+  I,
+  II,
+  S,
+  LC,
+  Directives,
+  Exposed,
+  Provide
+> & {
   // allow any custom options
   [key: string]: any
-} & ComponentOptionsBase &
-  ThisType<
+} & ThisType<
     CreateComponentPublicInstanceWithMixins<
       {},
       RawBindings,
@@ -314,26 +352,67 @@ export type InjectToObject<T extends ComponentInjectOptions> =
         }
       : never
 
-interface LegacyOptions {
+/**
+ * @deprecated
+ */
+interface LegacyOptions<
+  Props,
+  D,
+  C extends ComputedOptions,
+  M extends MethodOptions,
+  Mixin,
+  Extends,
+  I extends ComponentInjectOptions,
+  II extends string,
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
+> {
   compatConfig?: CompatConfig
 
+  // // allow any custom options
+  // [key: string]: any
+
   // state
   // Limitation: we cannot expose RawBindings on the `this` context for data
   // since that leads to some sort of circular inference and breaks ThisType
   // for the entire component.
-  data?: (vm: any) => any
-  computed?: ComputedOptions
-  methods?: MethodOptions
+  data?: (
+    this: CreateComponentPublicInstanceWithMixins<
+      Props,
+      {},
+      {},
+      {},
+      MethodOptions,
+      Mixin,
+      Extends
+    >,
+    vm: CreateComponentPublicInstanceWithMixins<
+      Props,
+      {},
+      {},
+      {},
+      MethodOptions,
+      Mixin,
+      Extends
+    >,
+  ) => D
+  computed?: C
+  methods?: M
   watch?: ComponentWatchOptions
-  provide?: ComponentProvideOptions
-  inject?: ComponentInjectOptions
+  provide?: Provide
+  inject?: I | II[]
 
   // assets
   filters?: Record<string, Function>
 
   // composition
-  mixins?: any[]
-  extends?: any
+  mixins?: (Mixin & {
+    // allow any custom options
+    [key: string]: any
+  })[]
+  extends?: Extends & {
+    // allow any custom options
+    [key: string]: any
+  }
 
   // lifecycle
   beforeCreate?(): any
@@ -359,6 +438,16 @@ interface LegacyOptions {
    * @deprecated use `compilerOptions.delimiters` instead.
    */
   delimiters?: [string, string]
+
+  // /**
+  //  * #3468
+  //  *
+  //  * type-only, used to assist Mixin's type inference,
+  //  * typescript will try to simplify the inferred `Mixin` type,
+  //  * with the `__differentiator`, typescript won't be able to combine different mixins,
+  //  * because the `__differentiator` will be different
+  //  */
+  // __differentiator?: keyof D | keyof C | keyof M
 }
 
 type MergedHook<T = () => void> = T | T[]
@@ -1010,3 +1099,210 @@ function mergeWatchOptions(
   }
   return merged
 }
+
+// Deprecated legacy types, kept because they were previously exported ---------
+
+/**
+ * @deprecated
+ */
+export type ComponentOptionsMixin = {}
+
+/**
+ * @deprecated
+ */
+export type ComponentOptionsWithoutProps<
+  Props = {},
+  RawBindings = {},
+  D = {},
+  C extends ComputedOptions = {},
+  M extends MethodOptions = {},
+  Mixin = {},
+  Extends = {},
+  E extends EmitsOptions = {},
+  EE extends string = string,
+  I extends ComponentInjectOptions = {},
+  II extends string = string,
+  S extends SlotsType = {},
+  LC extends Record<string, Component> = {},
+  Directives extends Record<string, Directive> = {},
+  Exposed extends string = string,
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
+  TE extends ComponentTypeEmits = {},
+  ResolvedEmits extends EmitsOptions = {} extends E
+    ? TypeEmitsToOptions<TE>
+    : E,
+  PE = Props & EmitsToProps<ResolvedEmits>,
+> = ComponentOptionsBase<
+  PE,
+  RawBindings,
+  D,
+  C,
+  M,
+  Mixin,
+  Extends,
+  E,
+  EE,
+  {},
+  I,
+  II,
+  S,
+  LC,
+  Directives,
+  Exposed,
+  Provide
+> & {
+  props?: never
+  /**
+   * @private for language-tools use only
+   */
+  __typeProps?: Props
+  /**
+   * @private for language-tools use only
+   */
+  __typeEmits?: TE
+} & ThisType<
+    CreateComponentPublicInstanceWithMixins<
+      PE,
+      RawBindings,
+      D,
+      C,
+      M,
+      Mixin,
+      Extends,
+      ResolvedEmits,
+      EE,
+      {},
+      false,
+      I,
+      S,
+      LC,
+      Directives,
+      Exposed
+    >
+  >
+
+/**
+ * @deprecated
+ */
+export type ComponentOptionsWithArrayProps<
+  PropNames extends string = string,
+  RawBindings = {},
+  D = {},
+  C extends ComputedOptions = {},
+  M extends MethodOptions = {},
+  Mixin = {},
+  Extends = {},
+  E extends EmitsOptions = EmitsOptions,
+  EE extends string = string,
+  I extends ComponentInjectOptions = {},
+  II extends string = string,
+  S extends SlotsType = {},
+  LC extends Record<string, Component> = {},
+  Directives extends Record<string, Directive> = {},
+  Exposed extends string = string,
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
+  Props = Prettify<Readonly<{ [key in PropNames]?: any } & EmitsToProps<E>>>,
+> = ComponentOptionsBase<
+  Props,
+  RawBindings,
+  D,
+  C,
+  M,
+  Mixin,
+  Extends,
+  E,
+  EE,
+  {},
+  I,
+  II,
+  S,
+  LC,
+  Directives,
+  Exposed,
+  Provide
+> & {
+  props: PropNames[]
+} & ThisType<
+    CreateComponentPublicInstanceWithMixins<
+      Props,
+      RawBindings,
+      D,
+      C,
+      M,
+      Mixin,
+      Extends,
+      E,
+      Props,
+      {},
+      false,
+      I,
+      S,
+      LC,
+      Directives,
+      Exposed
+    >
+  >
+
+/**
+ * @deprecated
+ */
+export type ComponentOptionsWithObjectProps<
+  PropsOptions = ComponentObjectPropsOptions,
+  RawBindings = {},
+  D = {},
+  C extends ComputedOptions = {},
+  M extends MethodOptions = {},
+  Mixin = {},
+  Extends = {},
+  E extends EmitsOptions = EmitsOptions,
+  EE extends string = string,
+  I extends ComponentInjectOptions = {},
+  II extends string = string,
+  S extends SlotsType = {},
+  LC extends Record<string, Component> = {},
+  Directives extends Record<string, Directive> = {},
+  Exposed extends string = string,
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
+  Props = Prettify<
+    Readonly<ExtractPropTypes<PropsOptions>> & Readonly<EmitsToProps<E>>
+  >,
+  Defaults = ExtractDefaultPropTypes<PropsOptions>,
+> = ComponentOptionsBase<
+  Props,
+  RawBindings,
+  D,
+  C,
+  M,
+  Mixin,
+  Extends,
+  E,
+  EE,
+  Defaults,
+  I,
+  II,
+  S,
+  LC,
+  Directives,
+  Exposed,
+  Provide
+> & {
+  props: PropsOptions & ThisType<void>
+} & ThisType<
+    CreateComponentPublicInstanceWithMixins<
+      Props,
+      RawBindings,
+      D,
+      C,
+      M,
+      Mixin,
+      Extends,
+      E,
+      Props,
+      Defaults,
+      false,
+      I,
+      S,
+      LC,
+      Directives
+    >
+  >
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 9a34f324572..920339d1b6a 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -277,6 +277,7 @@ export type {
   ComponentCustomOptions,
   ComponentOptionsBase,
   ComponentProvideOptions,
+  ComponentStaticOptions,
   RenderFunction,
   MethodOptions,
   ComputedOptions,
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index e49f5008336..57563874a89 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -6,8 +6,8 @@ import {
   type ComponentInternalInstance,
   type ComponentObjectPropsOptions,
   type ComponentOptions,
-  type ComponentOptionsBase,
   type ComponentProvideOptions,
+  type ComponentStaticOptions,
   type ComputedOptions,
   type ConcreteComponent,
   type CreateAppFunction,
@@ -151,23 +151,7 @@ export function defineCustomElement<
 
     // allow any custom options
     [key: string]: any
-  } & Omit<
-      ComponentOptionsBase,
-      | 'props'
-      | 'emits'
-      | 'computed'
-      | 'methods'
-      | 'mixins'
-      | 'extends'
-      | 'inject'
-      | 'slots'
-      | 'components'
-      | 'directives'
-      | 'expose'
-      | 'provide'
-      | 'setup'
-      | 'data'
-    > &
+  } & ComponentStaticOptions &
     ThisType<
       CreateComponentPublicInstanceWithMixins<
         Readonly<ResolvedProps>,

From acd0e86069fe785173e015688ecc90ffddba4a59 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 13:53:17 +0800
Subject: [PATCH 046/127] wip [skip ci]

---
 packages/runtime-core/src/componentOptions.ts | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 361d77fb767..f9b15c9cdd5 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -105,7 +105,6 @@ export type RenderFunction = () => VNodeChild
 
 export type ComponentStaticOptions = Omit<
   ComponentOptionsBase<{}, {}, {}, {}, {}, {}, {}, {}>,
-  | 'props'
   | 'emits'
   | 'components'
   | 'directives'
@@ -119,6 +118,7 @@ export type ComponentStaticOptions = Omit<
   | 'extends'
   | 'setup'
   | 'data'
+  | '__differentiator'
 >
 
 export interface ComponentOptionsBase<
@@ -439,15 +439,15 @@ interface LegacyOptions<
    */
   delimiters?: [string, string]
 
-  // /**
-  //  * #3468
-  //  *
-  //  * type-only, used to assist Mixin's type inference,
-  //  * typescript will try to simplify the inferred `Mixin` type,
-  //  * with the `__differentiator`, typescript won't be able to combine different mixins,
-  //  * because the `__differentiator` will be different
-  //  */
-  // __differentiator?: keyof D | keyof C | keyof M
+  /**
+   * #3468
+   *
+   * type-only, used to assist Mixin's type inference,
+   * typescript will try to simplify the inferred `Mixin` type,
+   * with the `__differentiator`, typescript won't be able to combine different mixins,
+   * because the `__differentiator` will be different
+   */
+  __differentiator?: keyof D | keyof C | keyof M
 }
 
 type MergedHook<T = () => void> = T | T[]

From 547b60c9b4e5f240dedf4740cfd3403b6c6722ce Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 14:01:23 +0800
Subject: [PATCH 047/127] wip [skip ci]

---
 .../runtime-core/src/apiDefineComponent.ts    |  2 ++
 packages/runtime-core/src/componentOptions.ts |  2 +-
 .../src/componentPublicInstance.ts            | 30 ++++++++++++++++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index e58f109a340..2a34079edb7 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -173,6 +173,7 @@ type InferComponentOptions<T> = T &
           // MakeDefaultsOptional - if TypeProps is provided, set to false to use
           // user props types verbatim
           unknown extends TypeProps ? true : false,
+          {},
           {}, // InjectOptions
           Slots & {},
           Exposed & string,
@@ -311,6 +312,7 @@ export function defineComponent<
     {}, // PublicProps
     {}, // Defaults
     false,
+    {},
     InjectOptions,
     Slots,
     Exposed,
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index f9b15c9cdd5..6c3b87c2f14 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -80,7 +80,7 @@ import {
 import type { OptionMergeFunction } from './apiCreateApp'
 import { LifecycleHooks } from './enums'
 import type { SlotsType } from './componentSlots'
-import { ComponentTypeEmits, normalizePropsOrEmits } from './apiSetupHelpers'
+import { type ComponentTypeEmits, normalizePropsOrEmits } from './apiSetupHelpers'
 import { markAsyncBoundary } from './helpers/useId'
 
 /**
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 46daa8fc683..d7037ef1c29 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -35,6 +35,7 @@ import {
 } from '@vue/reactivity'
 import {
   type ComponentInjectOptions,
+  type ComponentOptionsBase,
   type ComponentProvideOptions,
   type ComputedOptions,
   type ExtractComputedReturns,
@@ -174,6 +175,25 @@ export type CreateComponentPublicInstanceWithMixins<
   PublicProps,
   PublicDefaults,
   MakeDefaultsOptional,
+  ComponentOptionsBase<
+    P,
+    B,
+    D,
+    C,
+    M,
+    Mixin,
+    Extends,
+    E,
+    string,
+    Defaults,
+    {},
+    string,
+    S,
+    LC,
+    Directives,
+    Exposed,
+    Provide
+  >,
   I,
   S,
   Exposed,
@@ -198,6 +218,7 @@ export type ComponentPublicInstance<
   PublicProps = {},
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
+  Options = {},
   I extends ComponentInjectOptions = {},
   S extends SlotsType = {},
   Exposed extends string = '',
@@ -217,10 +238,11 @@ export type ComponentPublicInstance<
   $host: Element | null
   $emit: EmitFn<E>
   $el: TypeEl
-  $options: MergedComponentOptionsOverride & {
-    // allow any custom options
-    [key: string]: any
-  }
+  $options: Options &
+    MergedComponentOptionsOverride & {
+      // allow any custom options
+      [key: string]: any
+    }
   $forceUpdate: () => void
   $nextTick: typeof nextTick
   $watch<T extends string | ((...args: any) => any)>(

From 5d03c016c1a419ccfb22ad42a331c6a7f7819212 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 14:08:20 +0800
Subject: [PATCH 048/127] wip [skip ci]

---
 packages/runtime-core/src/apiSetupHelpers.ts | 33 ++++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 6aa3d70b570..241a75e54c5 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -30,7 +30,14 @@ import type {
 import { warn } from './warning'
 import type { SlotsType, StrictUnwrapSlotsType } from './componentSlots'
 import type { Ref } from '@vue/reactivity'
-import type { CreateComponentPublicInstanceWithMixins } from './componentPublicInstance'
+import type {
+  ComponentPublicInstance,
+  EnsureNonVoid,
+  ExtractMixinComputed,
+  ExtractMixinData,
+  ExtractMixinMethods,
+  ExtractMixinSetupBindings,
+} from './componentPublicInstance'
 
 // dev only
 const warnRuntimeUsage = (method: string) =>
@@ -189,19 +196,20 @@ export function defineExpose<
  * @see {@link https://vuejs.org/api/sfc-script-setup.html#defineoptions}
  */
 export function defineOptions<
+  RawBindings = {},
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
   Mixin = {},
   Extends = {},
-  DataVM = CreateComponentPublicInstanceWithMixins<
-    {},
-    {},
+  InternalInstance = ComponentPublicInstance<
     {},
-    {},
-    MethodOptions,
-    Mixin,
-    Extends
+    ExtractMixinSetupBindings<Mixin> &
+      ExtractMixinSetupBindings<Extends> &
+      RawBindings,
+    ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<D>,
+    ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & C,
+    ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & M
   >,
 >(
   options?: {
@@ -209,7 +217,7 @@ export function defineOptions<
     methods?: M
     mixins?: Mixin[]
     extends?: Extends
-    data?: (this: DataVM, vm: DataVM) => D
+    data?: (vm: NoInfer<InternalInstance>) => D
     /**
      * setup should be defined via `<script setup>`.
      */
@@ -230,7 +238,12 @@ export function defineOptions<
      * slots should be defined via defineSlots().
      */
     slots?: never
-  } & ComponentStaticOptions,
+  } & ComponentStaticOptions &
+    ThisType<
+      NoInfer<InternalInstance> & {
+        $options: typeof options
+      }
+    >,
 ): void {
   if (__DEV__) {
     warnRuntimeUsage(`defineOptions`)

From 2944d27663312eb9964543d35fe8593f8056dfaa Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 14:11:13 +0800
Subject: [PATCH 049/127] wip [skip ci]

---
 packages/runtime-core/src/apiDefineComponent.ts      |  2 +-
 packages/runtime-core/src/apiSetupHelpers.ts         |  2 +-
 packages/runtime-core/src/componentPublicInstance.ts | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 2a34079edb7..7bf50bdbe33 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -145,7 +145,7 @@ type InferComponentOptions<T> = T &
           >,
           ExtractMixinSetupBindings<Mixin> &
             ExtractMixinSetupBindings<Extends> &
-            SetupBindings,
+            EnsureNonVoid<SetupBindings>,
           ExtractMixinData<Mixin> &
             ExtractMixinData<Extends> &
             EnsureNonVoid<Data>,
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 241a75e54c5..745ae9cd128 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -206,7 +206,7 @@ export function defineOptions<
     {},
     ExtractMixinSetupBindings<Mixin> &
       ExtractMixinSetupBindings<Extends> &
-      RawBindings,
+      EnsureNonVoid<RawBindings>,
     ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<D>,
     ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & C,
     ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & M
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index d7037ef1c29..f59e07319b9 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -149,9 +149,7 @@ export type CreateComponentPublicInstanceWithMixins<
   TypeEl extends Element = any,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   // mixin inference
-  PublicP = ExtractMixinProps<Mixin> &
-    ExtractMixinProps<Extends> &
-    EnsureNonVoid<P>,
+  PublicP = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & P,
   PublicB = ExtractMixinSetupBindings<Mixin> &
     ExtractMixinSetupBindings<Extends> &
     EnsureNonVoid<B>,
@@ -160,11 +158,11 @@ export type CreateComponentPublicInstanceWithMixins<
     EnsureNonVoid<D>,
   PublicC extends ComputedOptions = ExtractMixinComputed<Mixin> &
     ExtractMixinComputed<Extends> &
-    EnsureNonVoid<C>,
+    C,
   PublicM extends MethodOptions = ExtractMixinMethods<Mixin> &
     ExtractMixinMethods<Extends> &
-    EnsureNonVoid<M>,
-  PublicDefaults = {} & EnsureNonVoid<Defaults>, // TODO
+    M,
+  PublicDefaults = {} & Defaults, // TODO
 > = ComponentPublicInstance<
   PublicP,
   PublicB,

From ddfd4067a39d3cfe210678795a0be2cdbbc00553 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 14:19:30 +0800
Subject: [PATCH 050/127] wip [skip ci]

---
 packages/runtime-core/src/componentOptions.ts | 11 ++--
 .../src/componentPublicInstance.ts            | 61 +++++++++++++++++++
 packages/runtime-core/src/index.ts            |  5 ++
 3 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 6c3b87c2f14..7df841d97eb 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -80,7 +80,10 @@ import {
 import type { OptionMergeFunction } from './apiCreateApp'
 import { LifecycleHooks } from './enums'
 import type { SlotsType } from './componentSlots'
-import { type ComponentTypeEmits, normalizePropsOrEmits } from './apiSetupHelpers'
+import {
+  type ComponentTypeEmits,
+  normalizePropsOrEmits,
+} from './apiSetupHelpers'
 import { markAsyncBoundary } from './helpers/useId'
 
 /**
@@ -352,9 +355,6 @@ export type InjectToObject<T extends ComponentInjectOptions> =
         }
       : never
 
-/**
- * @deprecated
- */
 interface LegacyOptions<
   Props,
   D,
@@ -368,9 +368,6 @@ interface LegacyOptions<
 > {
   compatConfig?: CompatConfig
 
-  // // allow any custom options
-  // [key: string]: any
-
   // state
   // Limitation: we cannot expose RawBindings on the `this` context for data
   // since that leads to some sort of circular inference and breaks ThisType
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index f59e07319b9..87636aebfb7 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -121,6 +121,67 @@ export interface ComponentPublicInstanceConstructor<T> {
   new (...args: any[]): T
 }
 
+/**
+ * @deprecated This is no longer used internally, but exported and relied on by
+ * existing library types generated by vue-tsc.
+ */
+export type CreateComponentPublicInstance<
+  P = {},
+  B = {},
+  D = {},
+  C extends ComputedOptions = {},
+  M extends MethodOptions = {},
+  Mixin = {},
+  Extends = {},
+  E extends EmitsOptions = {},
+  PublicProps = P,
+  Defaults = {},
+  MakeDefaultsOptional extends boolean = false,
+  I extends ComponentInjectOptions = {},
+  S extends SlotsType = {},
+  PublicP = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & P,
+  PublicB = ExtractMixinSetupBindings<Mixin> &
+    ExtractMixinSetupBindings<Extends> &
+    EnsureNonVoid<B>,
+  PublicD = ExtractMixinData<Mixin> &
+    ExtractMixinData<Extends> &
+    EnsureNonVoid<D>,
+  PublicC extends ComputedOptions = ExtractMixinComputed<Mixin> &
+    ExtractMixinComputed<Extends> &
+    C,
+  PublicM extends MethodOptions = ExtractMixinMethods<Mixin> &
+    ExtractMixinMethods<Extends> &
+    M,
+  PublicDefaults = {} & Defaults,
+> = ComponentPublicInstance<
+  PublicP,
+  PublicB,
+  PublicD,
+  PublicC,
+  PublicM,
+  E,
+  PublicProps,
+  PublicDefaults,
+  MakeDefaultsOptional,
+  ComponentOptionsBase<
+    P,
+    B,
+    D,
+    C,
+    M,
+    Mixin,
+    Extends,
+    E,
+    string,
+    Defaults,
+    {},
+    string,
+    S
+  >,
+  I,
+  S
+>
+
 /**
  * This is the same as `CreateComponentPublicInstance` but adds local components,
  * global directives, exposed, and provide inference.
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 920339d1b6a..1649ec997c2 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -283,6 +283,10 @@ export type {
   ComputedOptions,
   RuntimeCompilerOptions,
   ComponentInjectOptions,
+  // deprecated
+  ComponentOptionsWithoutProps,
+  ComponentOptionsWithArrayProps,
+  ComponentOptionsWithObjectProps,
 } from './componentOptions'
 export type {
   EmitsOptions,
@@ -295,6 +299,7 @@ export type {
   ExtractMixinProps,
   ComponentPublicInstance,
   ComponentCustomProperties,
+  // CreateComponentPublicInstance,
   CreateComponentPublicInstanceWithMixins,
 } from './componentPublicInstance'
 export type {

From 3cafd5ce5dacf8df6215414ffd70b5e02e8cd7bd Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 14:21:02 +0800
Subject: [PATCH 051/127] wip [skip ci]

---
 packages/runtime-core/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 1649ec997c2..e5b8939284d 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -299,7 +299,7 @@ export type {
   ExtractMixinProps,
   ComponentPublicInstance,
   ComponentCustomProperties,
-  // CreateComponentPublicInstance,
+  CreateComponentPublicInstance,
   CreateComponentPublicInstanceWithMixins,
 } from './componentPublicInstance'
 export type {

From 4d5ad5483b7e9171f143751066a5489f8bb48327 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 14:25:05 +0800
Subject: [PATCH 052/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 6 +++---
 packages/runtime-core/src/apiSetupHelpers.ts    | 4 ++--
 packages/runtime-core/src/componentOptions.ts   | 2 +-
 packages/runtime-core/src/index.ts              | 2 +-
 packages/runtime-dom/src/apiCustomElement.ts    | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 7bf50bdbe33..19dc25ac117 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -18,8 +18,8 @@ import type {
   ComponentInjectOptions,
   ComponentOptions,
   ComponentProvideOptions,
-  ComponentStaticOptions,
   ComputedOptions,
+  ConcreteComponentOptions,
   MethodOptions,
   ObjectInjectOptions,
   RenderFunction,
@@ -180,7 +180,7 @@ type InferComponentOptions<T> = T &
           TypeRefs & {},
           TypeEl & Element
         >
-      } & ComponentStaticOptions
+      } & ConcreteComponentOptions
     : {})
 
 export type DefineSetupFnComponent<
@@ -364,7 +364,7 @@ export function defineComponent<
 
     // allow any custom options
     [key: string]: any
-  } & ComponentStaticOptions &
+  } & ConcreteComponentOptions &
     ThisType<
       NoInfer<InternalInstance> & {
         $options: typeof options
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 745ae9cd128..666cc5ac850 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -17,8 +17,8 @@ import {
 } from './component'
 import type { EmitFn, EmitsOptions, ObjectEmitsOptions } from './componentEmits'
 import type {
-  ComponentStaticOptions,
   ComputedOptions,
+  ConcreteComponentOptions,
   MethodOptions,
 } from './componentOptions'
 import type {
@@ -238,7 +238,7 @@ export function defineOptions<
      * slots should be defined via defineSlots().
      */
     slots?: never
-  } & ComponentStaticOptions &
+  } & ConcreteComponentOptions &
     ThisType<
       NoInfer<InternalInstance> & {
         $options: typeof options
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 7df841d97eb..df129fc4a84 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -106,7 +106,7 @@ export interface ComponentCustomOptions {}
 
 export type RenderFunction = () => VNodeChild
 
-export type ComponentStaticOptions = Omit<
+export type ConcreteComponentOptions = Omit<
   ComponentOptionsBase<{}, {}, {}, {}, {}, {}, {}, {}>,
   | 'emits'
   | 'components'
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index e5b8939284d..8cd8eedbc7f 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -277,7 +277,7 @@ export type {
   ComponentCustomOptions,
   ComponentOptionsBase,
   ComponentProvideOptions,
-  ComponentStaticOptions,
+  ConcreteComponentOptions,
   RenderFunction,
   MethodOptions,
   ComputedOptions,
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index 57563874a89..c7817ba7fc6 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -7,9 +7,9 @@ import {
   type ComponentObjectPropsOptions,
   type ComponentOptions,
   type ComponentProvideOptions,
-  type ComponentStaticOptions,
   type ComputedOptions,
   type ConcreteComponent,
+  type ConcreteComponentOptions,
   type CreateAppFunction,
   type CreateComponentPublicInstanceWithMixins,
   type Directive,
@@ -151,7 +151,7 @@ export function defineCustomElement<
 
     // allow any custom options
     [key: string]: any
-  } & ComponentStaticOptions &
+  } & ConcreteComponentOptions &
     ThisType<
       CreateComponentPublicInstanceWithMixins<
         Readonly<ResolvedProps>,

From 1681139eee6b1b1619fb79db1dee5487fb943e15 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 14:52:04 +0800
Subject: [PATCH 053/127] wip

---
 packages/runtime-core/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 8cd8eedbc7f..a5bc0450b9f 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -274,6 +274,7 @@ export type {
 } from './apiDefineComponent'
 export type {
   ComponentOptions,
+  ComponentOptionsMixin,
   ComponentCustomOptions,
   ComponentOptionsBase,
   ComponentProvideOptions,

From 0df8be2b175bf7ff6d8ed840867492a7a5c33bd2 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 15:31:16 +0800
Subject: [PATCH 054/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 122 +++++++++++-------
 1 file changed, 78 insertions(+), 44 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 19dc25ac117..f16d3417afa 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -49,6 +49,13 @@ export type PublicProps = VNodeProps &
   AllowedComponentProps &
   ComponentCustomProps
 
+type ResolveProps<PropsOrPropOptions, E extends EmitsOptions> = Readonly<
+  PropsOrPropOptions extends ComponentPropsOptions
+    ? ExtractPropTypes<PropsOrPropOptions>
+    : PropsOrPropOptions
+> &
+  ({} extends E ? {} : EmitsToProps<E>)
+
 export type DefineComponent<
   OptionsOrPropsOrPropOptions = {},
   RawBindings = {},
@@ -57,6 +64,11 @@ export type DefineComponent<
   M extends MethodOptions = MethodOptions,
   Mixin = {},
   Extends = {},
+  E extends EmitsOptions = {},
+  _EE extends string = string,
+  _PP = PublicProps,
+  _Props = ResolveProps<OptionsOrPropsOrPropOptions, E>,
+  _Defaults = ExtractDefaultPropTypes<OptionsOrPropsOrPropOptions>,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
@@ -64,30 +76,32 @@ export type DefineComponent<
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = OptionsOrPropsOrPropOptions extends { props?: any }
-  ? InferComponentOptions<OptionsOrPropsOrPropOptions>
-  : InferComponentOptions<{
-      props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
-        ? OptionsOrPropsOrPropOptions
-        : {}
-      computed?: C
-      methods?: M
-      mixins?: Mixin[]
-      extends?: Extends
-      inject?: {}
-      slots?: S
-      components?: LC & GlobalComponents
-      directives?: Directives & GlobalDirectives
-      expose?: Exposed[]
-      provide?: Provide
-      setup?: () => RawBindings
-      data?: () => D
-      __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
-        ? unknown
-        : OptionsOrPropsOrPropOptions
-      __typeRefs?: TypeRefs
-      __typeEl?: TypeEl
-    }>
+> = InferComponentOptions<
+  OptionsOrPropsOrPropOptions extends { props?: any }
+    ? OptionsOrPropsOrPropOptions
+    : {
+        props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+          ? OptionsOrPropsOrPropOptions
+          : {}
+        computed?: C
+        methods?: M
+        mixins?: Mixin[]
+        extends?: Extends
+        inject?: {}
+        slots?: S
+        components?: LC & GlobalComponents
+        directives?: Directives & GlobalDirectives
+        expose?: Exposed[]
+        provide?: Provide
+        setup?: () => RawBindings
+        data?: () => D
+        __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+          ? unknown
+          : OptionsOrPropsOrPropOptions
+        __typeRefs?: TypeRefs
+        __typeEl?: TypeEl
+      }
+>
 
 type InferComponentOptions<T> = T &
   (T extends {
@@ -370,26 +384,46 @@ export function defineComponent<
         $options: typeof options
       }
     >,
-): DefineComponent<{
-  props?: PropsOptions
-  emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
-  components?: LocalComponents & GlobalComponents
-  directives?: Directives & GlobalDirectives
-  slots?: Slots
-  expose?: Exposed[]
-  computed?: Computed
-  methods?: Methods
-  provide?: Provide
-  inject?: InjectOptions
-  mixins?: Mixin[]
-  extends?: Extends
-  setup?(): SetupBindings
-  data?(): Data
-  __typeProps?: TypeProps
-  __typeEmits?: TypeEmits
-  __typeRefs?: TypeRefs
-  __typeEl?: TypeEl
-}>
+): DefineComponent<
+  {
+    props?: PropsOptions
+    emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
+    components?: LocalComponents & GlobalComponents
+    directives?: Directives & GlobalDirectives
+    slots?: Slots
+    expose?: Exposed[]
+    computed?: Computed
+    methods?: Methods
+    provide?: Provide
+    inject?: InjectOptions
+    mixins?: Mixin[]
+    extends?: Extends
+    setup?(): SetupBindings
+    data?(): Data
+    __typeProps?: TypeProps
+    __typeEmits?: TypeEmits
+    __typeRefs?: TypeRefs
+    __typeEl?: TypeEl
+  },
+  {},
+  {},
+  {},
+  {},
+  {},
+  {},
+  {},
+  string,
+  {},
+  {},
+  {},
+  {},
+  {},
+  {},
+  string,
+  {},
+  {},
+  any
+>
 
 // implementation, close to no-op
 /*! #__NO_SIDE_EFFECTS__ */

From 2aa79e07d55af3cc18e6e843ff7e807908bd3bd7 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 15:45:35 +0800
Subject: [PATCH 055/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index f16d3417afa..71a072c6a81 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -74,6 +74,7 @@ export type DefineComponent<
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
+  _MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
 > = InferComponentOptions<
@@ -405,23 +406,24 @@ export function defineComponent<
     __typeRefs?: TypeRefs
     __typeEl?: TypeEl
   },
-  {},
-  {},
-  {},
-  {},
-  {},
-  {},
-  {},
-  string,
-  {},
-  {},
-  {},
-  {},
-  {},
-  {},
-  string,
-  {},
-  {},
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
   any
 >
 

From ef1fd2f4ef10fec82a09dcf316038f8423b01293 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 15:56:10 +0800
Subject: [PATCH 056/127] wip

---
 packages/runtime-core/src/h.ts | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/packages/runtime-core/src/h.ts b/packages/runtime-core/src/h.ts
index e0b760c3233..e2da149429f 100644
--- a/packages/runtime-core/src/h.ts
+++ b/packages/runtime-core/src/h.ts
@@ -1,9 +1,5 @@
 import { type IfAny, isArray, isObject } from '@vue/shared'
-import type {
-  Component,
-  ConcreteComponent,
-  FunctionalComponent,
-} from './component'
+import type { Component, FunctionalComponent } from './component'
 import type { EmitsOptions } from './componentEmits'
 import type {
   ComponentObjectPropsOptions,
@@ -178,17 +174,6 @@ export function h<
   children?: RawChildren | RawSlots,
 ): VNode
 
-// concrete component
-export function h(
-  type: ConcreteComponent | string,
-  children?: RawChildren,
-): VNode
-export function h<P>(
-  type: ConcreteComponent<P> | string,
-  props?: NoInfer<(RawProps & P) | ({} extends P ? null : never)>,
-  children?: RawChildren,
-): VNode
-
 // catch all types
 export function h(type: string | Component, children?: RawChildren): VNode
 export function h<P>(

From 704fbe6f7d8f4c200f9f834cfa4c5cba41e84a51 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 16:06:27 +0800
Subject: [PATCH 057/127] wip

---
 packages/runtime-dom/src/apiCustomElement.ts | 61 +++++++-------------
 1 file changed, 22 insertions(+), 39 deletions(-)

diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index c7817ba7fc6..796e7dc7fbd 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -13,7 +13,6 @@ import {
   type CreateAppFunction,
   type CreateComponentPublicInstanceWithMixins,
   type Directive,
-  type EmitsOptions,
   type EmitsToProps,
   type ExtractMixinProps,
   type ExtractPropTypes,
@@ -64,21 +63,15 @@ export interface CustomElementOptions {
 // overload 1: direct setup function
 export function defineCustomElement<Props, RawBindings = object>(
   setup: (props: Props, ctx: SetupContext) => RawBindings | RenderFunction,
-  options?: {
-    name?: string
-    inheritAttrs?: boolean
-    emits?: EmitsOptions
-  } & CustomElementOptions & {
+  options?: Pick<ComponentOptions, 'name' | 'inheritAttrs' | 'emits'> &
+    CustomElementOptions & {
       props?: (keyof Props)[]
     },
 ): VueElementConstructor<Props>
 export function defineCustomElement<Props, RawBindings = object>(
   setup: (props: Props, ctx: SetupContext) => RawBindings | RenderFunction,
-  options?: {
-    name?: string
-    inheritAttrs?: boolean
-    emits?: EmitsOptions
-  } & CustomElementOptions & {
+  options?: Pick<ComponentOptions, 'name' | 'inheritAttrs' | 'emits'> &
+    CustomElementOptions & {
       props?: ComponentObjectPropsOptions<Props>
     },
 ): VueElementConstructor<Props>
@@ -113,14 +106,23 @@ export function defineCustomElement<
   ResolvedProps = InferredProps & EmitsToProps<RuntimeEmitsOptions>,
   PublicP = ResolvedProps &
     Prettify<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>,
-  DataVM = CreateComponentPublicInstanceWithMixins<
-    PublicP,
-    {},
-    {},
-    {},
-    MethodOptions,
+  InternalInstance = CreateComponentPublicInstanceWithMixins<
+    Readonly<ResolvedProps>,
+    SetupBindings,
+    Data,
+    Computed,
+    Methods,
     Mixin,
-    Extends
+    Extends,
+    RuntimeEmitsOptions,
+    _EmitsKeys,
+    {},
+    false,
+    InjectOptions,
+    Slots,
+    LocalComponents,
+    Directives,
+    Exposed
   >,
 >(
   options: CustomElementOptions & {
@@ -147,31 +149,12 @@ export function defineCustomElement<
       props: NoInfer<LooseRequired<PublicP>>,
       ctx: NoInfer<SetupContext<RuntimeEmitsOptions, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
-    data?: (this: DataVM, vm: DataVM) => Data
+    data?: (vm: NoInfer<InternalInstance>) => Data
 
     // allow any custom options
     [key: string]: any
   } & ConcreteComponentOptions &
-    ThisType<
-      CreateComponentPublicInstanceWithMixins<
-        Readonly<ResolvedProps>,
-        SetupBindings,
-        Data,
-        Computed,
-        Methods,
-        Mixin,
-        Extends,
-        RuntimeEmitsOptions,
-        _EmitsKeys,
-        {},
-        false,
-        InjectOptions,
-        Slots,
-        LocalComponents,
-        Directives,
-        Exposed
-      >
-    >,
+    ThisType<NoInfer<InternalInstance>>,
   extraOptions?: CustomElementOptions,
 ): VueElementConstructor<ResolvedProps>
 

From e89d447d4b9d78cce74be65e2c43608cba7d939d Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 16:08:13 +0800
Subject: [PATCH 058/127] wip

---
 packages/runtime-core/__tests__/componentEmits.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/__tests__/componentEmits.spec.ts b/packages/runtime-core/__tests__/componentEmits.spec.ts
index 8b1ab8a223e..dc82c04919f 100644
--- a/packages/runtime-core/__tests__/componentEmits.spec.ts
+++ b/packages/runtime-core/__tests__/componentEmits.spec.ts
@@ -586,7 +586,7 @@ describe('component: emit', () => {
         two: twoFn,
         three: null,
       })
-      expect((this.$options.emits as any).two).toBe(twoFn)
+      expect(this.$options.emits.two).toBe(twoFn)
       return h('div')
     })
     const ComponentC = defineComponent({

From a02d8f4ce0b9c59543c4d5d613991c25cb983f7a Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 17:45:36 +0800
Subject: [PATCH 059/127] wip

---
 packages/runtime-core/src/componentOptions.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index df129fc4a84..bd70959f45b 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -121,7 +121,6 @@ export type ConcreteComponentOptions = Omit<
   | 'extends'
   | 'setup'
   | 'data'
-  | '__differentiator'
 >
 
 export interface ComponentOptionsBase<
@@ -435,16 +434,6 @@ interface LegacyOptions<
    * @deprecated use `compilerOptions.delimiters` instead.
    */
   delimiters?: [string, string]
-
-  /**
-   * #3468
-   *
-   * type-only, used to assist Mixin's type inference,
-   * typescript will try to simplify the inferred `Mixin` type,
-   * with the `__differentiator`, typescript won't be able to combine different mixins,
-   * because the `__differentiator` will be different
-   */
-  __differentiator?: keyof D | keyof C | keyof M
 }
 
 type MergedHook<T = () => void> = T | T[]

From 087f9de697c4ef1d4e4c06d2b11bb3f380fa9ba0 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 18:24:11 +0800
Subject: [PATCH 060/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 71a072c6a81..e0acc4cddd3 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -68,19 +68,27 @@ export type DefineComponent<
   _EE extends string = string,
   _PP = PublicProps,
   _Props = ResolveProps<OptionsOrPropsOrPropOptions, E>,
-  _Defaults = ExtractDefaultPropTypes<OptionsOrPropsOrPropOptions>,
+  Defaults = ExtractDefaultPropTypes<OptionsOrPropsOrPropOptions>,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  _MakeDefaultsOptional extends boolean = true,
+  MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = InferComponentOptions<
-  OptionsOrPropsOrPropOptions extends { props?: any }
-    ? OptionsOrPropsOrPropOptions
-    : {
+> = OptionsOrPropsOrPropOptions extends {
+  props?: any
+  __typeProps?: infer TypeProps
+}
+  ? InferComponentOptions<
+      OptionsOrPropsOrPropOptions,
+      // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+      // user props types verbatim
+      unknown extends TypeProps ? true : false
+    >
+  : InferComponentOptions<
+      {
         props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? OptionsOrPropsOrPropOptions
           : {}
@@ -101,10 +109,16 @@ export type DefineComponent<
           : OptionsOrPropsOrPropOptions
         __typeRefs?: TypeRefs
         __typeEl?: TypeEl
-      }
->
+      },
+      MakeDefaultsOptional,
+      Defaults
+    >
 
-type InferComponentOptions<T> = T &
+type InferComponentOptions<
+  T,
+  MakeDefaultsOptional extends boolean,
+  Defaults = {},
+> = T &
   (T extends {
     props?: infer PropsOptions
     emits?: infer RuntimeEmitsOptions
@@ -182,12 +196,13 @@ type InferComponentOptions<T> = T &
               : {}) &
             TypeEmitsToOptions<TypeEmits & {}>,
           PublicProps,
-          ExtractDefaultPropTypes<
-            ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
-          >,
-          // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-          // user props types verbatim
-          unknown extends TypeProps ? true : false,
+          Defaults &
+            ExtractDefaultPropTypes<
+              ExtractMixinProps<Mixin> &
+                ExtractMixinProps<Extends> &
+                PropsOptions
+            >,
+          MakeDefaultsOptional,
           {},
           {}, // InjectOptions
           Slots & {},

From 5cdb2de25a4a8ed9cc46566bb82a3da17ea1815e Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 18:49:35 +0800
Subject: [PATCH 061/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index e0acc4cddd3..9371dff60e6 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -1,4 +1,4 @@
-import { type LooseRequired, extend, isFunction } from '@vue/shared'
+import { IfAny, type LooseRequired, extend, isFunction } from '@vue/shared'
 import type { ComponentTypeEmits } from './apiSetupHelpers'
 import type {
   AllowedComponentProps,
@@ -77,16 +77,12 @@ export type DefineComponent<
   MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = OptionsOrPropsOrPropOptions extends {
-  props?: any
-  __typeProps?: infer TypeProps
-}
-  ? InferComponentOptions<
-      OptionsOrPropsOrPropOptions,
-      // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-      // user props types verbatim
-      unknown extends TypeProps ? true : false
-    >
+> = 'props' extends keyof IfAny<
+  OptionsOrPropsOrPropOptions,
+  {},
+  OptionsOrPropsOrPropOptions
+>
+  ? InferComponentOptions<OptionsOrPropsOrPropOptions, unknown>
   : InferComponentOptions<
       {
         props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
@@ -116,7 +112,7 @@ export type DefineComponent<
 
 type InferComponentOptions<
   T,
-  MakeDefaultsOptional extends boolean,
+  MakeDefaultsOptional extends boolean | unknown,
   Defaults = {},
 > = T &
   (T extends {
@@ -196,13 +192,20 @@ type InferComponentOptions<
               : {}) &
             TypeEmitsToOptions<TypeEmits & {}>,
           PublicProps,
-          Defaults &
-            ExtractDefaultPropTypes<
-              ExtractMixinProps<Mixin> &
-                ExtractMixinProps<Extends> &
-                PropsOptions
-            >,
-          MakeDefaultsOptional,
+          MakeDefaultsOptional extends boolean
+            ? Defaults
+            : ExtractDefaultPropTypes<
+                ExtractMixinProps<Mixin> &
+                  ExtractMixinProps<Extends> &
+                  PropsOptions
+              >,
+          MakeDefaultsOptional extends boolean
+            ? MakeDefaultsOptional
+            : // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+              // user props types verbatim
+              unknown extends TypeProps
+              ? true
+              : false,
           {},
           {}, // InjectOptions
           Slots & {},

From 162b267c7a4c976a56a34b19ef43553b3b494cdd Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 10:50:35 +0000
Subject: [PATCH 062/127] [autofix.ci] apply automated fixes

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 9371dff60e6..ad2243f2b91 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -1,4 +1,4 @@
-import { IfAny, type LooseRequired, extend, isFunction } from '@vue/shared'
+import { type IfAny, type LooseRequired, extend, isFunction } from '@vue/shared'
 import type { ComponentTypeEmits } from './apiSetupHelpers'
 import type {
   AllowedComponentProps,

From c164f78f58f26a5085eef5d3110d485143afb03e Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 18:59:48 +0800
Subject: [PATCH 063/127] wip

---
 packages/runtime-core/src/componentOptions.ts        |  7 ++++++-
 packages/runtime-core/src/componentPublicInstance.ts | 11 +++++++++--
 packages/runtime-dom/src/apiCustomElement.ts         |  4 +++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index bd70959f45b..adb9bdb5375 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -147,7 +147,12 @@ export interface ComponentOptionsBase<
   setup?: (
     this: void,
     props: LooseRequired<
-      Props & Prettify<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+      Props &
+        Prettify<
+          ExtractPropTypes<
+            ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>
+          >
+        >
     >,
     ctx: SetupContext<E, S>,
   ) => Promise<RawBindings> | RawBindings | RenderFunction | void
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 87636aebfb7..203a907d801 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -52,6 +52,7 @@ import { currentRenderingInstance } from './componentRenderContext'
 import { warn } from './warning'
 import { installCompatInstanceProperties } from './compat/instance'
 import type { Directive } from './directives'
+import type { ExtractPropTypes } from './componentProps'
 
 /**
  * Custom properties added to component instances in any way and can be accessed through `this`
@@ -139,7 +140,10 @@ export type CreateComponentPublicInstance<
   MakeDefaultsOptional extends boolean = false,
   I extends ComponentInjectOptions = {},
   S extends SlotsType = {},
-  PublicP = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & P,
+  PublicP = ExtractPropTypes<
+    ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>
+  > &
+    P,
   PublicB = ExtractMixinSetupBindings<Mixin> &
     ExtractMixinSetupBindings<Extends> &
     EnsureNonVoid<B>,
@@ -210,7 +214,10 @@ export type CreateComponentPublicInstanceWithMixins<
   TypeEl extends Element = any,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   // mixin inference
-  PublicP = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & P,
+  PublicP = ExtractPropTypes<
+    ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>
+  > &
+    P,
   PublicB = ExtractMixinSetupBindings<Mixin> &
     ExtractMixinSetupBindings<Extends> &
     EnsureNonVoid<B>,
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index 796e7dc7fbd..89d91b25b08 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -105,7 +105,9 @@ export function defineCustomElement<
     : ExtractPropTypes<RuntimePropsOptions>,
   ResolvedProps = InferredProps & EmitsToProps<RuntimeEmitsOptions>,
   PublicP = ResolvedProps &
-    Prettify<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>,
+    Prettify<
+      ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+    >,
   InternalInstance = CreateComponentPublicInstanceWithMixins<
     Readonly<ResolvedProps>,
     SetupBindings,

From a395ec7f4cd646399d2ea19d600b9bbe4a14d8dd Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 19:15:55 +0800
Subject: [PATCH 064/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ad2243f2b91..7c846f2fdd7 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -98,7 +98,7 @@ export type DefineComponent<
         directives?: Directives & GlobalDirectives
         expose?: Exposed[]
         provide?: Provide
-        setup?: () => RawBindings
+        setup?: (props: any, ctx: SetupContext) => RawBindings
         data?: () => D
         __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? unknown

From 47422d3f221eafb83223cb8158021d954df265bb Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 20:08:35 +0800
Subject: [PATCH 065/127] Revert "wip"

This reverts commit a395ec7f4cd646399d2ea19d600b9bbe4a14d8dd.
---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 7c846f2fdd7..ad2243f2b91 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -98,7 +98,7 @@ export type DefineComponent<
         directives?: Directives & GlobalDirectives
         expose?: Exposed[]
         provide?: Provide
-        setup?: (props: any, ctx: SetupContext) => RawBindings
+        setup?: () => RawBindings
         data?: () => D
         __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? unknown

From cde07e741f3b74e65b2cc0e5d6b6468245d00ad1 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 20:40:50 +0800
Subject: [PATCH 066/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ad2243f2b91..6e7babbca58 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -98,8 +98,8 @@ export type DefineComponent<
         directives?: Directives & GlobalDirectives
         expose?: Exposed[]
         provide?: Provide
-        setup?: () => RawBindings
-        data?: () => D
+        setup?: (props: any, ctx: SetupContext) => RawBindings
+        data?: (vm: any) => D
         __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? unknown
           : OptionsOrPropsOrPropOptions
@@ -124,8 +124,8 @@ type InferComponentOptions<
     methods?: infer Methods
     mixins?: (infer Mixin)[]
     extends?: infer Extends
-    setup?(): infer SetupBindings
-    data?(): infer Data
+    setup?(props: any, ctx: any): infer SetupBindings
+    data?(vm: any): infer Data
     __typeProps?: infer TypeProps
     __typeEmits?: infer TypeEmits
     __typeRefs?: infer TypeRefs
@@ -141,6 +141,10 @@ type InferComponentOptions<
          * because the `__differentiator` will be different
          */
         __differentiator?: keyof Data | keyof Computed | keyof Methods
+
+        // allow any custom options
+        [key: string]: any
+
         new (...args: any[]): ComponentPublicInstance<
           Readonly<
             ExtractPropTypes<

From aefdb558b8a1f39ae49c80fb1bf9ee6ca5da1913 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 21:07:44 +0800
Subject: [PATCH 067/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 6e7babbca58..877e208920c 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -132,6 +132,9 @@ type InferComponentOptions<
     __typeEl?: infer TypeEl
   }
     ? {
+        components?: GlobalComponents
+        directives?: GlobalDirectives
+
         /**
          * #3468
          *
@@ -411,8 +414,8 @@ export function defineComponent<
   {
     props?: PropsOptions
     emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
-    components?: LocalComponents & GlobalComponents
-    directives?: Directives & GlobalDirectives
+    components?: LocalComponents
+    directives?: Directives
     slots?: Slots
     expose?: Exposed[]
     computed?: Computed

From 0966ab1a316a8140100decb0cc12fe54e67515aa Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 21:15:34 +0800
Subject: [PATCH 068/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 877e208920c..9bfa78eb39b 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -77,14 +77,14 @@ export type DefineComponent<
   MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = 'props' extends keyof IfAny<
-  OptionsOrPropsOrPropOptions,
-  {},
-  OptionsOrPropsOrPropOptions
->
-  ? InferComponentOptions<OptionsOrPropsOrPropOptions, unknown>
-  : InferComponentOptions<
-      {
+> = InferComponentOptions<
+  'props' extends keyof IfAny<
+    OptionsOrPropsOrPropOptions,
+    {},
+    OptionsOrPropsOrPropOptions
+  >
+    ? OptionsOrPropsOrPropOptions
+    : {
         props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? OptionsOrPropsOrPropOptions
           : {}
@@ -106,9 +106,15 @@ export type DefineComponent<
         __typeRefs?: TypeRefs
         __typeEl?: TypeEl
       },
-      MakeDefaultsOptional,
-      Defaults
-    >
+  'props' extends keyof IfAny<
+    OptionsOrPropsOrPropOptions,
+    {},
+    OptionsOrPropsOrPropOptions
+  >
+    ? unknown
+    : MakeDefaultsOptional,
+  Defaults
+>
 
 type InferComponentOptions<
   T,

From 697afee23d977a6bb9819598096b90bb884c21dc Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 22:08:21 +0800
Subject: [PATCH 069/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 9bfa78eb39b..b53df25d119 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -387,7 +387,7 @@ export function defineComponent<
     extends?: Extends
     setup?: (
       this: void,
-      props: NoInfer<LooseRequired<InferredProps>>,
+      props: LooseRequired<InferredProps>,
       ctx: NoInfer<SetupContext<ResolvedEmits_Internal, Slots>>,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
     data?: (vm: NoInfer<InternalInstance>) => Data

From 1cbc953b80b06fbda72d9b7593855c3e2b0bc73c Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 22:26:06 +0800
Subject: [PATCH 070/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 12 ++++++----
 packages/runtime-core/src/apiSetupHelpers.ts  |  5 ++--
 packages/runtime-core/src/componentOptions.ts | 24 +++++++++----------
 .../src/componentPublicInstance.ts            |  9 +++----
 packages/runtime-dom/src/apiCustomElement.ts  |  6 ++---
 5 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index b53df25d119..76d1200e0b9 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -17,6 +17,7 @@ import type {
 import type {
   ComponentInjectOptions,
   ComponentOptions,
+  ComponentOptionsMixin,
   ComponentProvideOptions,
   ComputedOptions,
   ConcreteComponentOptions,
@@ -62,10 +63,10 @@ export type DefineComponent<
   D = {},
   C extends ComputedOptions = ComputedOptions,
   M extends MethodOptions = MethodOptions,
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = {},
-  _EE extends string = string,
+  EE extends string = string,
   _PP = PublicProps,
   _Props = ResolveProps<OptionsOrPropsOrPropOptions, E>,
   Defaults = ExtractDefaultPropTypes<OptionsOrPropsOrPropOptions>,
@@ -88,6 +89,7 @@ export type DefineComponent<
         props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? OptionsOrPropsOrPropOptions
           : {}
+        emits?: string extends EE ? E : EE[]
         computed?: C
         methods?: M
         mixins?: Mixin[]
@@ -306,8 +308,8 @@ export function defineComponent<
   SetupBindings = {},
   Computed extends ComputedOptions = {},
   Methods extends MethodOptions = {},
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   Slots extends SlotsType = {},
   LocalComponents extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 666cc5ac850..ba1dc080ba8 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -17,6 +17,7 @@ import {
 } from './component'
 import type { EmitFn, EmitsOptions, ObjectEmitsOptions } from './componentEmits'
 import type {
+  ComponentOptionsMixin,
   ComputedOptions,
   ConcreteComponentOptions,
   MethodOptions,
@@ -200,8 +201,8 @@ export function defineOptions<
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   InternalInstance = ComponentPublicInstance<
     {},
     ExtractMixinSetupBindings<Mixin> &
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index adb9bdb5375..b940ba09da9 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -129,8 +129,8 @@ export interface ComponentOptionsBase<
   D,
   C extends ComputedOptions,
   M extends MethodOptions,
-  Mixin,
-  Extends,
+  Mixin extends ComponentOptionsMixin,
+  Extends extends ComponentOptionsMixin,
   E extends EmitsOptions,
   EE extends string = string,
   Defaults = {},
@@ -257,8 +257,8 @@ export type ComponentOptions<
   D = any,
   C extends ComputedOptions = any,
   M extends MethodOptions = any,
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = any,
   EE extends string = string,
   Defaults = {},
@@ -364,8 +364,8 @@ interface LegacyOptions<
   D,
   C extends ComputedOptions,
   M extends MethodOptions,
-  Mixin,
-  Extends,
+  Mixin extends ComponentOptionsMixin,
+  Extends extends ComponentOptionsMixin,
   I extends ComponentInjectOptions,
   II extends string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
@@ -1107,8 +1107,8 @@ export type ComponentOptionsWithoutProps<
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = {},
   EE extends string = string,
   I extends ComponentInjectOptions = {},
@@ -1181,8 +1181,8 @@ export type ComponentOptionsWithArrayProps<
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = EmitsOptions,
   EE extends string = string,
   I extends ComponentInjectOptions = {},
@@ -1243,8 +1243,8 @@ export type ComponentOptionsWithObjectProps<
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = EmitsOptions,
   EE extends string = string,
   I extends ComponentInjectOptions = {},
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 203a907d801..3af6efa9c65 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -36,6 +36,7 @@ import {
 import {
   type ComponentInjectOptions,
   type ComponentOptionsBase,
+  type ComponentOptionsMixin,
   type ComponentProvideOptions,
   type ComputedOptions,
   type ExtractComputedReturns,
@@ -132,8 +133,8 @@ export type CreateComponentPublicInstance<
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = {},
   PublicProps = P,
   Defaults = {},
@@ -199,8 +200,8 @@ export type CreateComponentPublicInstanceWithMixins<
   D = {},
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = {},
   PublicProps = P,
   Defaults = {},
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index 89d91b25b08..4f8232fa083 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -41,7 +41,7 @@ import {
   isPlainObject,
   toNumber,
 } from '@vue/shared'
-import { createApp, createSSRApp, render } from '.'
+import { type ComponentOptionsMixin, createApp, createSSRApp, render } from '.'
 
 // marker for attr removal
 const REMOVAL = {}
@@ -87,8 +87,8 @@ export function defineCustomElement<
   SetupBindings = {},
   Computed extends ComputedOptions = {},
   Methods extends MethodOptions = {},
-  Mixin = {},
-  Extends = {},
+  Mixin extends ComponentOptionsMixin = {},
+  Extends extends ComponentOptionsMixin = {},
   InjectOptions extends ComponentInjectOptions = {},
   Slots extends SlotsType = {},
   LocalComponents extends Record<string, Component> = {},

From 74fbec8d01fc4527492a559e846118cca0984a16 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 24 Feb 2025 22:42:09 +0800
Subject: [PATCH 071/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 76d1200e0b9..4cf8ae6366c 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -100,8 +100,8 @@ export type DefineComponent<
         directives?: Directives & GlobalDirectives
         expose?: Exposed[]
         provide?: Provide
-        setup?: (props: any, ctx: SetupContext) => RawBindings
-        data?: (vm: any) => D
+        setup?: (props: any, ctx: SetupContext) => RawBindings & {}
+        data?: (vm: any) => D & {}
         __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? unknown
           : OptionsOrPropsOrPropOptions

From 6cb4b3bcc59cabd65ad1e1ccbf800d9a127f49df Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 00:33:29 +0800
Subject: [PATCH 072/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 90 +++++++++++--------
 .../src/componentPublicInstance.ts            |  3 +-
 2 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 4cf8ae6366c..452969829a7 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -12,6 +12,7 @@ import type {
   EmitsOptions,
   EmitsToProps,
   ObjectEmitsOptions,
+  ShortEmitsToObject,
   TypeEmitsToOptions,
 } from './componentEmits'
 import type {
@@ -169,18 +170,17 @@ type InferComponentOptions<
             > &
               TypeProps &
               EmitsToProps<
-                // ResolvedEmits
                 ExtractMixinEmits<Mixin> &
                   ExtractMixinEmits<Extends> &
-                  (unknown extends TypeEmits
-                    ? string[] extends RuntimeEmitsOptions
-                      ? {}
-                      : RuntimeEmitsOptions extends (infer Keys extends
-                            string)[]
-                        ? { [K in Keys]: (...args: any) => any }
-                        : RuntimeEmitsOptions
-                    : {}) &
-                  TypeEmitsToOptions<TypeEmits & {}>
+                  ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits> &
+                  TypeEmitsToOptions<
+                    string[] extends RuntimeEmitsOptions
+                      ? TypeEmits & {}
+                      : ResolveTypeEmits<
+                          RuntimeEmitsOptions & {},
+                          TypeEmits
+                        > & {}
+                  >
               >
           >,
           ExtractMixinSetupBindings<Mixin> &
@@ -195,17 +195,9 @@ type InferComponentOptions<
           ExtractMixinMethods<Mixin> &
             ExtractMixinMethods<Extends> &
             Methods & {},
-          // ResolvedEmits
           ExtractMixinEmits<Mixin> &
             ExtractMixinEmits<Extends> &
-            (unknown extends TypeEmits
-              ? string[] extends RuntimeEmitsOptions
-                ? {}
-                : RuntimeEmitsOptions extends (infer Keys extends string)[]
-                  ? { [K in Keys]: (...args: any) => any }
-                  : RuntimeEmitsOptions
-              : {}) &
-            TypeEmitsToOptions<TypeEmits & {}>,
+            ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits>,
           PublicProps,
           MakeDefaultsOptional extends boolean
             ? Defaults
@@ -226,7 +218,8 @@ type InferComponentOptions<
           Slots & {},
           Exposed & string,
           TypeRefs & {},
-          TypeEl & Element
+          TypeEl & Element,
+          ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
         >
       } & ConcreteComponentOptions
     : {})
@@ -255,6 +248,28 @@ export type DefineSetupFnComponent<
   S
 >
 
+type ResolveEmitsOptions<
+  RuntimeEmitsOptions extends EmitsOptions,
+  TypeEmits extends ComponentTypeEmits | unknown,
+> = unknown extends TypeEmits
+  ? RuntimeEmitsOptions extends ObjectEmitsOptions
+    ? RuntimeEmitsOptions
+    : {}
+  : TypeEmits extends Record<string, any[]>
+    ? ShortEmitsToObject<TypeEmits>
+    : {}
+
+type ResolveTypeEmits<
+  RuntimeEmitsOptions extends EmitsOptions,
+  TypeEmits extends ComponentTypeEmits | unknown,
+> = TypeEmits extends (...args: any[]) => any
+  ? TypeEmits
+  : TypeEmits extends Record<string, any[]>
+    ? {}
+    : RuntimeEmitsOptions extends (infer Keys extends string)[]
+      ? (event: Keys, ...args: any[]) => void
+      : {}
+
 // defineComponent is a utility that is primarily used for type inference
 // when declaring components. Type inference is provided in the component
 // options (provided as the argument). The returned value has artificial types
@@ -322,19 +337,8 @@ export function defineComponent<
   // resolved types
   ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
-    (unknown extends TypeEmits
-      ? string[] extends RuntimeEmitsOptions
-        ? {}
-        : RuntimeEmitsOptions extends (infer Keys extends string)[]
-          ? { [K in Keys]: (...args: any) => any }
-          : RuntimeEmitsOptions
-      : {}) &
-    TypeEmitsToOptions<TypeEmits & {}>,
-  ResolvedEmits_Internal extends EmitsOptions = unknown extends TypeEmits
-    ? string[] extends RuntimeEmitsOptions
-      ? string[]
-      : ResolvedEmits
-    : ResolvedEmits,
+    ResolveEmitsOptions<RuntimeEmitsOptions, TypeEmits>,
+  ResolvedTypeEmits = ResolveTypeEmits<RuntimeEmitsOptions, TypeEmits>,
   InferredProps = Readonly<
     ExtractPropTypes<
       ExtractMixinProps<Mixin> &
@@ -346,7 +350,14 @@ export function defineComponent<
           : {})
     > &
       TypeProps &
-      EmitsToProps<ResolvedEmits>
+      EmitsToProps<
+        ResolvedEmits &
+          TypeEmitsToOptions<
+            string[] extends RuntimeEmitsOptions
+              ? TypeEmits & {}
+              : ResolvedTypeEmits & {}
+          >
+      >
   >,
   InternalInstance = ComponentPublicInstance<
     InferredProps,
@@ -356,7 +367,7 @@ export function defineComponent<
     ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<Data>,
     ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
     ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
-    ResolvedEmits_Internal,
+    ResolvedEmits,
     {}, // PublicProps
     {}, // Defaults
     false,
@@ -365,7 +376,8 @@ export function defineComponent<
     Slots,
     Exposed,
     TypeRefs,
-    TypeEl
+    TypeEl,
+    ResolvedTypeEmits
   >,
 >(
   options: {
@@ -390,7 +402,11 @@ export function defineComponent<
     setup?: (
       this: void,
       props: LooseRequired<InferredProps>,
-      ctx: NoInfer<SetupContext<ResolvedEmits_Internal, Slots>>,
+      ctx: NoInfer<
+        SetupContext<ResolvedEmits, Slots> & {
+          emit: ResolvedTypeEmits
+        }
+      >,
     ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
     data?: (vm: NoInfer<InternalInstance>) => Data
     /**
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 3af6efa9c65..f2ade8ae7c0 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -291,6 +291,7 @@ export type ComponentPublicInstance<
   Exposed extends string = '',
   TypeRefs extends Data = {},
   TypeEl extends Element = any,
+  TypeEmits = {},
 > = {
   $: ComponentInternalInstance
   $data: D
@@ -303,7 +304,7 @@ export type ComponentPublicInstance<
   $root: ComponentPublicInstance | null
   $parent: ComponentPublicInstance | null
   $host: Element | null
-  $emit: EmitFn<E>
+  $emit: EmitFn<E> & TypeEmits
   $el: TypeEl
   $options: Options &
     MergedComponentOptionsOverride & {

From bf20de1a370b041ac95687bd24eb6069614fcc1d Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 01:03:48 +0800
Subject: [PATCH 073/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 452969829a7..88e32e4a90a 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -279,7 +279,7 @@ type ResolveTypeEmits<
 // (uses user defined props interface)
 export function defineComponent<
   Props extends Record<string, any>,
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   EE extends string = string,
   S extends SlotsType = {},
 >(
@@ -295,7 +295,7 @@ export function defineComponent<
 ): DefineSetupFnComponent<Props, E, S>
 export function defineComponent<
   Props extends Record<string, any>,
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   EE extends string = string,
   S extends SlotsType = {},
 >(

From d14d71a7f6c66eaec8732daf49e939ddf9da72b3 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 01:30:40 +0800
Subject: [PATCH 074/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 88e32e4a90a..684a50f6cca 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -138,7 +138,7 @@ type InferComponentOptions<
     __typeProps?: infer TypeProps
     __typeEmits?: infer TypeEmits
     __typeRefs?: infer TypeRefs
-    __typeEl?: infer TypeEl
+    __typeEl?: infer TypeEl extends Element
   }
     ? {
         components?: GlobalComponents
@@ -218,7 +218,7 @@ type InferComponentOptions<
           Slots & {},
           Exposed & string,
           TypeRefs & {},
-          TypeEl & Element,
+          TypeEl,
           ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
         >
       } & ConcreteComponentOptions

From 6ad890bb409ad67736e8452ddc610849a23f2690 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 09:33:46 +0800
Subject: [PATCH 075/127] wip

---
 packages/runtime-core/src/componentPublicInstance.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index f2ade8ae7c0..be32cc8d05b 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -86,7 +86,7 @@ export type ExtractMixinProps<T> = UnionToIntersection<
   T extends { props?: infer P }
     ? P extends (infer K extends string)[]
       ? { [key in K]: null }
-      : NonNullable<P>
+      : P
     : {}
 >
 
@@ -94,16 +94,16 @@ export type ExtractMixinEmits<T> = UnionToIntersection<
   T extends { emits?: infer E }
     ? E extends (infer K extends string)[]
       ? { [key in K]: (...args: any) => any }
-      : NonNullable<E>
+      : E
     : {}
 >
 
 export type ExtractMixinMethods<T> = UnionToIntersection<
-  T extends { methods?: infer M } ? NonNullable<M> : {}
+  T extends { methods?: infer M } ? M : {}
 >
 
 export type ExtractMixinComputed<T> = UnionToIntersection<
-  T extends { computed?: infer C } ? NonNullable<C> : {}
+  T extends { computed?: infer C } ? C : {}
 >
 
 export type ExtractMixinData<T> = UnionToIntersection<

From 032295d005aa8ade96be3eb52a8ad91df5a08e97 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 09:56:31 +0800
Subject: [PATCH 076/127] wip

---
 packages-private/dts-test/defineComponent.test-d.tsx | 2 --
 packages/runtime-core/src/apiDefineComponent.ts      | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages-private/dts-test/defineComponent.test-d.tsx b/packages-private/dts-test/defineComponent.test-d.tsx
index cf9aa67449f..266490c19c3 100644
--- a/packages-private/dts-test/defineComponent.test-d.tsx
+++ b/packages-private/dts-test/defineComponent.test-d.tsx
@@ -321,11 +321,9 @@ describe('with object props', () => {
       myProp: {
         type: Number,
         validator(val: unknown): boolean {
-          // @ts-expect-error
           return val !== this.otherProp
         },
         default(): number {
-          // @ts-expect-error
           return this.otherProp + 1
         },
       },
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 684a50f6cca..e61bc55a960 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -381,10 +381,7 @@ export function defineComponent<
   >,
 >(
   options: {
-    props?:
-      | ComponentObjectPropsOptions
-      | (PropsOptions & ThisType<void>)
-      | _PropsKeys[]
+    props?: ComponentObjectPropsOptions | PropsOptions | _PropsKeys[]
     emits?:
       | ObjectEmitsOptions
       | (RuntimeEmitsOptions & ThisType<void>)

From f5706b8c8a2cebc00075b707580b5d445cbcf49b Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 11:05:17 +0800
Subject: [PATCH 077/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index e61bc55a960..e47bcbae2a9 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -1,4 +1,4 @@
-import { type IfAny, type LooseRequired, extend, isFunction } from '@vue/shared'
+import { type LooseRequired, extend, isFunction } from '@vue/shared'
 import type { ComponentTypeEmits } from './apiSetupHelpers'
 import type {
   AllowedComponentProps,
@@ -58,6 +58,8 @@ type ResolveProps<PropsOrPropOptions, E extends EmitsOptions> = Readonly<
 > &
   ({} extends E ? {} : EmitsToProps<E>)
 
+type NormalizePropsOptions<T> = ComponentPropsOptions extends T ? {} : T
+
 export type DefineComponent<
   OptionsOrPropsOrPropOptions = {},
   RawBindings = {},
@@ -80,11 +82,7 @@ export type DefineComponent<
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
 > = InferComponentOptions<
-  'props' extends keyof IfAny<
-    OptionsOrPropsOrPropOptions,
-    {},
-    OptionsOrPropsOrPropOptions
-  >
+  'props' extends keyof NormalizePropsOptions<OptionsOrPropsOrPropOptions>
     ? OptionsOrPropsOrPropOptions
     : {
         props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
@@ -109,11 +107,7 @@ export type DefineComponent<
         __typeRefs?: TypeRefs
         __typeEl?: TypeEl
       },
-  'props' extends keyof IfAny<
-    OptionsOrPropsOrPropOptions,
-    {},
-    OptionsOrPropsOrPropOptions
-  >
+  'props' extends keyof NormalizePropsOptions<OptionsOrPropsOrPropOptions>
     ? unknown
     : MakeDefaultsOptional,
   Defaults
@@ -163,9 +157,10 @@ type InferComponentOptions<
               ExtractMixinProps<Mixin> &
                 ExtractMixinProps<Extends> &
                 (unknown extends TypeProps
-                  ? PropsOptions extends (infer Keys extends string)[]
+                  ? NormalizePropsOptions<PropsOptions> extends (infer Keys extends
+                      string)[]
                     ? { [K in Keys]: null }
-                    : PropsOptions
+                    : NormalizePropsOptions<PropsOptions>
                   : {})
             > &
               TypeProps &
@@ -204,7 +199,7 @@ type InferComponentOptions<
             : ExtractDefaultPropTypes<
                 ExtractMixinProps<Mixin> &
                   ExtractMixinProps<Extends> &
-                  PropsOptions
+                  NormalizePropsOptions<PropsOptions>
               >,
           MakeDefaultsOptional extends boolean
             ? MakeDefaultsOptional
@@ -344,9 +339,10 @@ export function defineComponent<
       ExtractMixinProps<Mixin> &
         ExtractMixinProps<Extends> &
         (unknown extends TypeProps
-          ? PropsOptions extends (infer Keys extends string)[]
+          ? NormalizePropsOptions<PropsOptions> extends (infer Keys extends
+              string)[]
             ? { [K in Keys]: null }
-            : PropsOptions
+            : NormalizePropsOptions<PropsOptions>
           : {})
     > &
       TypeProps &
@@ -433,7 +429,7 @@ export function defineComponent<
     >,
 ): DefineComponent<
   {
-    props?: PropsOptions
+    props?: ComponentPropsOptions extends PropsOptions ? {} : PropsOptions
     emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
     components?: LocalComponents
     directives?: Directives

From 74eb495e5d3f1ebf9cb3c18868a6f6bef18b2095 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 11:06:20 +0800
Subject: [PATCH 078/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index e47bcbae2a9..70be8229145 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -429,7 +429,7 @@ export function defineComponent<
     >,
 ): DefineComponent<
   {
-    props?: ComponentPropsOptions extends PropsOptions ? {} : PropsOptions
+    props?: NormalizePropsOptions<ComponentPropsOptions>
     emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
     components?: LocalComponents
     directives?: Directives

From f50a16bea7753c5700b5f0b2bdce517fbe217a3e Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 11:07:04 +0800
Subject: [PATCH 079/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 70be8229145..e47bcbae2a9 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -429,7 +429,7 @@ export function defineComponent<
     >,
 ): DefineComponent<
   {
-    props?: NormalizePropsOptions<ComponentPropsOptions>
+    props?: ComponentPropsOptions extends PropsOptions ? {} : PropsOptions
     emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
     components?: LocalComponents
     directives?: Directives

From 5b0fd9e109004a99c95290989493ff11b71a5d84 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 11:09:55 +0800
Subject: [PATCH 080/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index e47bcbae2a9..6659f047c94 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -429,7 +429,7 @@ export function defineComponent<
     >,
 ): DefineComponent<
   {
-    props?: ComponentPropsOptions extends PropsOptions ? {} : PropsOptions
+    props?: NormalizePropsOptions<PropsOptions>
     emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
     components?: LocalComponents
     directives?: Directives

From b002495d0cfed039c43331d51994a6845423e306 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 11:26:26 +0800
Subject: [PATCH 081/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 6659f047c94..d7d6cbc4002 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -51,15 +51,10 @@ export type PublicProps = VNodeProps &
   AllowedComponentProps &
   ComponentCustomProps
 
-type ResolveProps<PropsOrPropOptions, E extends EmitsOptions> = Readonly<
-  PropsOrPropOptions extends ComponentPropsOptions
-    ? ExtractPropTypes<PropsOrPropOptions>
-    : PropsOrPropOptions
-> &
-  ({} extends E ? {} : EmitsToProps<E>)
-
 type NormalizePropsOptions<T> = ComponentPropsOptions extends T ? {} : T
 
+type NormalizeEmitsOptions<T> = EmitsOptions extends T ? {} : T
+
 export type DefineComponent<
   OptionsOrPropsOrPropOptions = {},
   RawBindings = {},
@@ -70,8 +65,8 @@ export type DefineComponent<
   Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = {},
   EE extends string = string,
-  _PP = PublicProps,
-  _Props = ResolveProps<OptionsOrPropsOrPropOptions, E>,
+  _PP = never,
+  _Props = never,
   Defaults = ExtractDefaultPropTypes<OptionsOrPropsOrPropOptions>,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
@@ -88,7 +83,7 @@ export type DefineComponent<
         props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? OptionsOrPropsOrPropOptions
           : {}
-        emits?: string extends EE ? E : EE[]
+        emits?: string extends EE ? NormalizeEmitsOptions<E> : EE[]
         computed?: C
         methods?: M
         mixins?: Mixin[]
@@ -311,8 +306,8 @@ export function defineComponent<
   TypeEmits extends ComponentTypeEmits | unknown = unknown,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-  PropsOptions extends ComponentPropsOptions = {},
-  RuntimeEmitsOptions extends EmitsOptions = string[],
+  RawPropsOptions extends ComponentPropsOptions = {},
+  RawEmitsOptions extends EmitsOptions = string[],
   InjectOptions extends ComponentInjectOptions = {},
   Data = {},
   SetupBindings = {},
@@ -330,26 +325,27 @@ export function defineComponent<
   _EmitsKeys extends string = string,
   _InjectKeys extends string = string,
   // resolved types
+  NormalizedProps = NormalizePropsOptions<RawPropsOptions>,
+  NormalizedEmits extends EmitsOptions = NormalizeEmitsOptions<RawEmitsOptions>,
   ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
-    ResolveEmitsOptions<RuntimeEmitsOptions, TypeEmits>,
-  ResolvedTypeEmits = ResolveTypeEmits<RuntimeEmitsOptions, TypeEmits>,
+    ResolveEmitsOptions<NormalizedEmits, TypeEmits>,
+  ResolvedTypeEmits = ResolveTypeEmits<NormalizedEmits, TypeEmits>,
   InferredProps = Readonly<
     ExtractPropTypes<
       ExtractMixinProps<Mixin> &
         ExtractMixinProps<Extends> &
         (unknown extends TypeProps
-          ? NormalizePropsOptions<PropsOptions> extends (infer Keys extends
-              string)[]
+          ? NormalizedProps extends (infer Keys extends string)[]
             ? { [K in Keys]: null }
-            : NormalizePropsOptions<PropsOptions>
+            : NormalizedProps
           : {})
     > &
       TypeProps &
       EmitsToProps<
         ResolvedEmits &
           TypeEmitsToOptions<
-            string[] extends RuntimeEmitsOptions
+            string[] extends NormalizedEmits
               ? TypeEmits & {}
               : ResolvedTypeEmits & {}
           >
@@ -377,10 +373,10 @@ export function defineComponent<
   >,
 >(
   options: {
-    props?: ComponentObjectPropsOptions | PropsOptions | _PropsKeys[]
+    props?: ComponentObjectPropsOptions | RawPropsOptions | _PropsKeys[]
     emits?:
       | ObjectEmitsOptions
-      | (RuntimeEmitsOptions & ThisType<void>)
+      | (RawEmitsOptions & ThisType<void>)
       | _EmitsKeys[]
     components?: Record<string, Component> | LocalComponents
     directives?: Record<string, Directive> | Directives
@@ -429,8 +425,8 @@ export function defineComponent<
     >,
 ): DefineComponent<
   {
-    props?: NormalizePropsOptions<PropsOptions>
-    emits?: string[] extends RuntimeEmitsOptions ? {} : RuntimeEmitsOptions
+    props?: NormalizedProps
+    emits?: NormalizedEmits
     components?: LocalComponents
     directives?: Directives
     slots?: Slots

From 700e3192def3ec52e7dae8ca6b431c540981f0c2 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 11:28:21 +0800
Subject: [PATCH 082/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index d7d6cbc4002..ed1426276c7 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -81,7 +81,7 @@ export type DefineComponent<
     ? OptionsOrPropsOrPropOptions
     : {
         props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
-          ? OptionsOrPropsOrPropOptions
+          ? NormalizePropsOptions<OptionsOrPropsOrPropOptions>
           : {}
         emits?: string extends EE ? NormalizeEmitsOptions<E> : EE[]
         computed?: C
@@ -152,10 +152,9 @@ type InferComponentOptions<
               ExtractMixinProps<Mixin> &
                 ExtractMixinProps<Extends> &
                 (unknown extends TypeProps
-                  ? NormalizePropsOptions<PropsOptions> extends (infer Keys extends
-                      string)[]
+                  ? PropsOptions extends (infer Keys extends string)[]
                     ? { [K in Keys]: null }
-                    : NormalizePropsOptions<PropsOptions>
+                    : PropsOptions
                   : {})
             > &
               TypeProps &
@@ -194,7 +193,7 @@ type InferComponentOptions<
             : ExtractDefaultPropTypes<
                 ExtractMixinProps<Mixin> &
                   ExtractMixinProps<Extends> &
-                  NormalizePropsOptions<PropsOptions>
+                  PropsOptions
               >,
           MakeDefaultsOptional extends boolean
             ? MakeDefaultsOptional

From a308147a92dcbe686cf230a5b874b030578ffd0d Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 12:12:23 +0800
Subject: [PATCH 083/127] wip

---
 packages/runtime-core/src/componentOptions.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index b940ba09da9..1b66613571a 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -164,12 +164,8 @@ export interface ComponentOptionsBase<
   // Luckily `render()` doesn't need any arguments nor does it care about return
   // type.
   render?: Function
-  // NOTE: extending both LC and Record<string, Component> allows objects to be forced
-  // to be of type Component, while still inferring LC generic
-  components?: LC & Record<string, Component>
-  // NOTE: extending both Directives and Record<string, Directive> allows objects to be forced
-  // to be of type Directive, while still inferring Directives generic
-  directives?: Directives & Record<string, Directive>
+  components?: Record<string, Component> | LC
+  directives?: Record<string, Directive> | Directives
   inheritAttrs?: boolean
   emits?: (E | EE[]) & ThisType<void>
   slots?: S

From 2b2f0e2f43686e26d8084083e4a3ee7c9eb373c5 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 12:26:28 +0800
Subject: [PATCH 084/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ed1426276c7..896c7c6aba5 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -425,7 +425,7 @@ export function defineComponent<
 ): DefineComponent<
   {
     props?: NormalizedProps
-    emits?: NormalizedEmits
+    emits?: string[] extends NormalizedEmits ? {} : NormalizedEmits
     components?: LocalComponents
     directives?: Directives
     slots?: Slots

From 16b846ef0a57ebc2e834acc623e31c598eca4271 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 14:48:11 +0800
Subject: [PATCH 085/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 62 ++++++------
 packages/runtime-core/src/apiSetupHelpers.ts  | 29 ++++--
 packages/runtime-core/src/component.ts        | 10 +-
 packages/runtime-core/src/componentOptions.ts | 96 ++++++-------------
 .../src/componentPublicInstance.ts            |  8 +-
 packages/runtime-core/src/index.ts            |  2 +-
 packages/runtime-dom/src/apiCustomElement.ts  | 47 +++++----
 7 files changed, 113 insertions(+), 141 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 896c7c6aba5..b9e1580d2c5 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -1,9 +1,10 @@
-import { type LooseRequired, extend, isFunction } from '@vue/shared'
+import { extend, isFunction } from '@vue/shared'
 import type { ComponentTypeEmits } from './apiSetupHelpers'
 import type {
   AllowedComponentProps,
   Component,
   ComponentCustomProps,
+  ComponentInternalOptions,
   GlobalComponents,
   GlobalDirectives,
   SetupContext,
@@ -16,12 +17,13 @@ import type {
   TypeEmitsToOptions,
 } from './componentEmits'
 import type {
+  ComponentCustomOptions,
   ComponentInjectOptions,
   ComponentOptions,
+  ComponentOptionsBase,
   ComponentOptionsMixin,
   ComponentProvideOptions,
   ComputedOptions,
-  ConcreteComponentOptions,
   MethodOptions,
   ObjectInjectOptions,
   RenderFunction,
@@ -113,6 +115,8 @@ type InferComponentOptions<
   MakeDefaultsOptional extends boolean | unknown,
   Defaults = {},
 > = T &
+  ComponentInternalOptions &
+  ComponentCustomOptions &
   (T extends {
     props?: infer PropsOptions
     emits?: infer RuntimeEmitsOptions
@@ -143,9 +147,6 @@ type InferComponentOptions<
          */
         __differentiator?: keyof Data | keyof Computed | keyof Methods
 
-        // allow any custom options
-        [key: string]: any
-
         new (...args: any[]): ComponentPublicInstance<
           Readonly<
             ExtractPropTypes<
@@ -210,7 +211,7 @@ type InferComponentOptions<
           TypeEl,
           ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
         >
-      } & ConcreteComponentOptions
+      }
     : {})
 
 export type DefineSetupFnComponent<
@@ -373,30 +374,6 @@ export function defineComponent<
 >(
   options: {
     props?: ComponentObjectPropsOptions | RawPropsOptions | _PropsKeys[]
-    emits?:
-      | ObjectEmitsOptions
-      | (RawEmitsOptions & ThisType<void>)
-      | _EmitsKeys[]
-    components?: Record<string, Component> | LocalComponents
-    directives?: Record<string, Directive> | Directives
-    slots?: Slots
-    expose?: Exposed[]
-    computed?: Computed
-    methods?: Methods
-    provide?: Provide
-    inject?: ObjectInjectOptions | InjectOptions | _InjectKeys[]
-    mixins?: Mixin[]
-    extends?: Extends
-    setup?: (
-      this: void,
-      props: LooseRequired<InferredProps>,
-      ctx: NoInfer<
-        SetupContext<ResolvedEmits, Slots> & {
-          emit: ResolvedTypeEmits
-        }
-      >,
-    ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
-    data?: (vm: NoInfer<InternalInstance>) => Data
     /**
      * @private for language-tools use only
      */
@@ -413,10 +390,27 @@ export function defineComponent<
      * @private for language-tools use only
      */
     __typeEl?: TypeEl
-
-    // allow any custom options
-    [key: string]: any
-  } & ConcreteComponentOptions &
+  } & ComponentOptionsBase<
+    InferredProps,
+    SetupBindings,
+    Data,
+    Computed,
+    Methods,
+    Mixin,
+    Extends,
+    ObjectEmitsOptions | (RawEmitsOptions & ThisType<void>) | _EmitsKeys[],
+    never,
+    never,
+    ObjectInjectOptions | InjectOptions | _InjectKeys[],
+    never,
+    Slots,
+    LocalComponents,
+    Directives,
+    Exposed,
+    Provide,
+    InferredProps,
+    InternalInstance
+  > &
     ThisType<
       NoInfer<InternalInstance> & {
         $options: typeof options
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index ba1dc080ba8..46854bfea56 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -17,9 +17,9 @@ import {
 } from './component'
 import type { EmitFn, EmitsOptions, ObjectEmitsOptions } from './componentEmits'
 import type {
+  ComponentOptionsBase,
   ComponentOptionsMixin,
   ComputedOptions,
-  ConcreteComponentOptions,
   MethodOptions,
 } from './componentOptions'
 import type {
@@ -214,11 +214,6 @@ export function defineOptions<
   >,
 >(
   options?: {
-    computed?: C
-    methods?: M
-    mixins?: Mixin[]
-    extends?: Extends
-    data?: (vm: NoInfer<InternalInstance>) => D
     /**
      * setup should be defined via `<script setup>`.
      */
@@ -239,7 +234,27 @@ export function defineOptions<
      * slots should be defined via defineSlots().
      */
     slots?: never
-  } & ConcreteComponentOptions &
+  } & ComponentOptionsBase<
+    {},
+    RawBindings,
+    D,
+    C,
+    M,
+    Mixin,
+    Extends,
+    {},
+    string,
+    {},
+    {},
+    string,
+    {},
+    {},
+    {},
+    string,
+    {},
+    {},
+    InternalInstance
+  > &
     ThisType<
       NoInfer<InternalInstance> & {
         $options: typeof options
diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index 6b2495fbe49..ba19b1e9991 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -251,7 +251,15 @@ export type ConcreteComponent<
   E extends EmitsOptions | Record<string, any[]> = string[],
   S extends Record<string, any> = any,
 > =
-  | ComponentOptions<Props, RawBindings, D, C, M>
+  | ComponentOptions<
+      Props,
+      RawBindings,
+      D,
+      C,
+      M,
+      ComponentOptions,
+      ComponentOptions
+    >
   | FunctionalComponent<Props, E, S>
 
 /**
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 1b66613571a..b21ece52e6a 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -106,23 +106,6 @@ export interface ComponentCustomOptions {}
 
 export type RenderFunction = () => VNodeChild
 
-export type ConcreteComponentOptions = Omit<
-  ComponentOptionsBase<{}, {}, {}, {}, {}, {}, {}, {}>,
-  | 'emits'
-  | 'components'
-  | 'directives'
-  | 'slots'
-  | 'expose'
-  | 'computed'
-  | 'methods'
-  | 'provide'
-  | 'inject'
-  | 'mixins'
-  | 'extends'
-  | 'setup'
-  | 'data'
->
-
 export interface ComponentOptionsBase<
   Props,
   RawBindings,
@@ -132,28 +115,34 @@ export interface ComponentOptionsBase<
   Mixin extends ComponentOptionsMixin,
   Extends extends ComponentOptionsMixin,
   E extends EmitsOptions,
-  EE extends string = string,
+  _EE extends string = never,
   Defaults = {},
   I extends ComponentInjectOptions = {},
-  II extends string = string,
+  _II extends string = never,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-> extends LegacyOptions<Props, D, C, M, Mixin, Extends, I, II, Provide>,
+  ResolvedProps = Props &
+    Prettify<
+      ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+    >,
+  InternalInstance = CreateComponentPublicInstanceWithMixins<
+    Props,
+    {},
+    {},
+    {},
+    MethodOptions,
+    Mixin,
+    Extends
+  >,
+> extends LegacyOptions<InternalInstance, D, C, M, Mixin, Extends, I, Provide>,
     ComponentInternalOptions,
     ComponentCustomOptions {
   setup?: (
     this: void,
-    props: LooseRequired<
-      Props &
-        Prettify<
-          ExtractPropTypes<
-            ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>
-          >
-        >
-    >,
+    props: LooseRequired<ResolvedProps>,
     ctx: SetupContext<E, S>,
   ) => Promise<RawBindings> | RawBindings | RenderFunction | void
   name?: string
@@ -167,7 +156,7 @@ export interface ComponentOptionsBase<
   components?: Record<string, Component> | LC
   directives?: Record<string, Directive> | Directives
   inheritAttrs?: boolean
-  emits?: (E | EE[]) & ThisType<void>
+  emits?: E
   slots?: S
   expose?: Exposed[]
   serverPrefetch?(): void | Promise<any>
@@ -283,10 +272,8 @@ export type ComponentOptions<
   Directives,
   Exposed,
   Provide
-> & {
-  // allow any custom options
-  [key: string]: any
-} & ThisType<
+> &
+  ThisType<
     CreateComponentPublicInstanceWithMixins<
       {},
       RawBindings,
@@ -356,60 +343,30 @@ export type InjectToObject<T extends ComponentInjectOptions> =
       : never
 
 interface LegacyOptions<
-  Props,
+  InternalInstance,
   D,
   C extends ComputedOptions,
   M extends MethodOptions,
   Mixin extends ComponentOptionsMixin,
   Extends extends ComponentOptionsMixin,
   I extends ComponentInjectOptions,
-  II extends string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
 > {
   compatConfig?: CompatConfig
 
-  // state
-  // Limitation: we cannot expose RawBindings on the `this` context for data
-  // since that leads to some sort of circular inference and breaks ThisType
-  // for the entire component.
-  data?: (
-    this: CreateComponentPublicInstanceWithMixins<
-      Props,
-      {},
-      {},
-      {},
-      MethodOptions,
-      Mixin,
-      Extends
-    >,
-    vm: CreateComponentPublicInstanceWithMixins<
-      Props,
-      {},
-      {},
-      {},
-      MethodOptions,
-      Mixin,
-      Extends
-    >,
-  ) => D
+  data?: (vm: NoInfer<InternalInstance>) => D
   computed?: C
   methods?: M
   watch?: ComponentWatchOptions
   provide?: Provide
-  inject?: I | II[]
+  inject?: I
 
   // assets
   filters?: Record<string, Function>
 
   // composition
-  mixins?: (Mixin & {
-    // allow any custom options
-    [key: string]: any
-  })[]
-  extends?: Extends & {
-    // allow any custom options
-    [key: string]: any
-  }
+  mixins?: Mixin[]
+  extends?: Extends
 
   // lifecycle
   beforeCreate?(): any
@@ -430,6 +387,9 @@ interface LegacyOptions<
   renderTriggered?: DebuggerHook
   errorCaptured?: ErrorCapturedHook
 
+  // allow any custom options
+  [key: string]: any
+
   /**
    * runtime compile only
    * @deprecated use `compilerOptions.delimiters` instead.
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index be32cc8d05b..47b8fa6cd4e 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -285,7 +285,7 @@ export type ComponentPublicInstance<
   PublicProps = {},
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
-  Options = {},
+  Options = any,
   I extends ComponentInjectOptions = {},
   S extends SlotsType = {},
   Exposed extends string = '',
@@ -306,11 +306,7 @@ export type ComponentPublicInstance<
   $host: Element | null
   $emit: EmitFn<E> & TypeEmits
   $el: TypeEl
-  $options: Options &
-    MergedComponentOptionsOverride & {
-      // allow any custom options
-      [key: string]: any
-    }
+  $options: Options & MergedComponentOptionsOverride
   $forceUpdate: () => void
   $nextTick: typeof nextTick
   $watch<T extends string | ((...args: any) => any)>(
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index a5bc0450b9f..d87082759c7 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -278,12 +278,12 @@ export type {
   ComponentCustomOptions,
   ComponentOptionsBase,
   ComponentProvideOptions,
-  ConcreteComponentOptions,
   RenderFunction,
   MethodOptions,
   ComputedOptions,
   RuntimeCompilerOptions,
   ComponentInjectOptions,
+  ObjectInjectOptions,
   // deprecated
   ComponentOptionsWithoutProps,
   ComponentOptionsWithArrayProps,
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index 4f8232fa083..aa6158cf09a 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -6,10 +6,10 @@ import {
   type ComponentInternalInstance,
   type ComponentObjectPropsOptions,
   type ComponentOptions,
+  type ComponentOptionsBase,
   type ComponentProvideOptions,
   type ComputedOptions,
   type ConcreteComponent,
-  type ConcreteComponentOptions,
   type CreateAppFunction,
   type CreateComponentPublicInstanceWithMixins,
   type Directive,
@@ -18,6 +18,7 @@ import {
   type ExtractPropTypes,
   type MethodOptions,
   type ObjectEmitsOptions,
+  type ObjectInjectOptions,
   type RenderFunction,
   type SetupContext,
   type SlotsType,
@@ -31,7 +32,6 @@ import {
   warn,
 } from '@vue/runtime-core'
 import {
-  type LooseRequired,
   type Prettify,
   camelize,
   extend,
@@ -132,30 +132,29 @@ export function defineCustomElement<
       | ComponentObjectPropsOptions
       | (RuntimePropsOptions & ThisType<void>)
       | _PropsKeys[]
-    emits?:
+  } & ComponentOptionsBase<
+      InferredProps,
+      SetupBindings,
+      Data,
+      Computed,
+      Methods,
+      Mixin,
+      Extends,
       | ObjectEmitsOptions
       | (RuntimeEmitsOptions & ThisType<void>)
-      | _EmitsKeys[]
-    computed?: Computed
-    methods?: Methods
-    mixins?: Mixin[]
-    extends?: Extends
-    inject?: ComponentInjectOptions | InjectOptions | _InjectKeys[]
-    slots?: Slots
-    components?: LocalComponents
-    directives?: Directives
-    expose?: Exposed[]
-    provide?: Provide
-    setup?: (
-      this: void,
-      props: NoInfer<LooseRequired<PublicP>>,
-      ctx: NoInfer<SetupContext<RuntimeEmitsOptions, Slots>>,
-    ) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
-    data?: (vm: NoInfer<InternalInstance>) => Data
-
-    // allow any custom options
-    [key: string]: any
-  } & ConcreteComponentOptions &
+      | _EmitsKeys[],
+      never,
+      never,
+      ObjectInjectOptions | InjectOptions | _InjectKeys[],
+      never,
+      Slots,
+      LocalComponents,
+      Directives,
+      Exposed,
+      Provide,
+      InferredProps,
+      InternalInstance
+    > &
     ThisType<NoInfer<InternalInstance>>,
   extraOptions?: CustomElementOptions,
 ): VueElementConstructor<ResolvedProps>

From a41107d45f341b198d4c358923cb4802c61a3c2f Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 14:52:42 +0800
Subject: [PATCH 086/127] wip

---
 packages/runtime-core/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index d87082759c7..9f57d89d098 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -261,6 +261,7 @@ export type {
   ComponentInternalInstance,
   SetupContext,
   ComponentCustomProps,
+  ComponentInternalOptions,
   AllowedComponentProps,
   GlobalComponents,
   GlobalDirectives,

From 997f5b565b721c1cc015080962a06303fe771025 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 14:59:13 +0800
Subject: [PATCH 087/127] wip

---
 packages/runtime-core/src/apiSetupHelpers.ts | 44 +-------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 46854bfea56..b03479d6a7e 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -31,14 +31,6 @@ import type {
 import { warn } from './warning'
 import type { SlotsType, StrictUnwrapSlotsType } from './componentSlots'
 import type { Ref } from '@vue/reactivity'
-import type {
-  ComponentPublicInstance,
-  EnsureNonVoid,
-  ExtractMixinComputed,
-  ExtractMixinData,
-  ExtractMixinMethods,
-  ExtractMixinSetupBindings,
-} from './componentPublicInstance'
 
 // dev only
 const warnRuntimeUsage = (method: string) =>
@@ -203,15 +195,6 @@ export function defineOptions<
   M extends MethodOptions = {},
   Mixin extends ComponentOptionsMixin = {},
   Extends extends ComponentOptionsMixin = {},
-  InternalInstance = ComponentPublicInstance<
-    {},
-    ExtractMixinSetupBindings<Mixin> &
-      ExtractMixinSetupBindings<Extends> &
-      EnsureNonVoid<RawBindings>,
-    ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<D>,
-    ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & C,
-    ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & M
-  >,
 >(
   options?: {
     /**
@@ -234,32 +217,7 @@ export function defineOptions<
      * slots should be defined via defineSlots().
      */
     slots?: never
-  } & ComponentOptionsBase<
-    {},
-    RawBindings,
-    D,
-    C,
-    M,
-    Mixin,
-    Extends,
-    {},
-    string,
-    {},
-    {},
-    string,
-    {},
-    {},
-    {},
-    string,
-    {},
-    {},
-    InternalInstance
-  > &
-    ThisType<
-      NoInfer<InternalInstance> & {
-        $options: typeof options
-      }
-    >,
+  } & ComponentOptionsBase<{}, RawBindings, D, C, M, Mixin, Extends, {}>,
 ): void {
   if (__DEV__) {
     warnRuntimeUsage(`defineOptions`)

From 16f62c360cd8642a60d40c3d6aeafa60e0121e48 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 15:37:14 +0800
Subject: [PATCH 088/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 216 ++++++++++--------
 packages/runtime-core/src/componentOptions.ts |  12 +-
 .../src/componentPublicInstance.ts            |   4 +-
 3 files changed, 122 insertions(+), 110 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index b9e1580d2c5..26cf4bb9f7a 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -4,7 +4,6 @@ import type {
   AllowedComponentProps,
   Component,
   ComponentCustomProps,
-  ComponentInternalOptions,
   GlobalComponents,
   GlobalDirectives,
   SetupContext,
@@ -17,7 +16,6 @@ import type {
   TypeEmitsToOptions,
 } from './componentEmits'
 import type {
-  ComponentCustomOptions,
   ComponentInjectOptions,
   ComponentOptions,
   ComponentOptionsBase,
@@ -92,8 +90,8 @@ export type DefineComponent<
         extends?: Extends
         inject?: {}
         slots?: S
-        components?: LC & GlobalComponents
-        directives?: Directives & GlobalDirectives
+        components?: LC
+        directives?: Directives
         expose?: Exposed[]
         provide?: Provide
         setup?: (props: any, ctx: SetupContext) => RawBindings & {}
@@ -114,105 +112,121 @@ type InferComponentOptions<
   T,
   MakeDefaultsOptional extends boolean | unknown,
   Defaults = {},
-> = T &
-  ComponentInternalOptions &
-  ComponentCustomOptions &
-  (T extends {
-    props?: infer PropsOptions
-    emits?: infer RuntimeEmitsOptions
-    slots?: infer Slots
-    expose?: (infer Exposed)[]
-    computed?: infer Computed
-    methods?: infer Methods
-    mixins?: (infer Mixin)[]
-    extends?: infer Extends
-    setup?(props: any, ctx: any): infer SetupBindings
-    data?(vm: any): infer Data
-    __typeProps?: infer TypeProps
-    __typeEmits?: infer TypeEmits
-    __typeRefs?: infer TypeRefs
-    __typeEl?: infer TypeEl extends Element
-  }
-    ? {
-        components?: GlobalComponents
-        directives?: GlobalDirectives
+> = T extends {
+  props?: infer PropsOptions
+  emits?: infer RuntimeEmitsOptions extends EmitsOptions
+  components?: infer LocalComponents extends Record<string, Component>
+  directives?: infer Directives extends Record<string, Directive>
+  slots?: infer Slots extends SlotsType
+  expose?: (infer Exposed extends string)[]
+  computed?: infer Computed extends ComputedOptions
+  methods?: infer Methods extends MethodOptions
+  provide?: infer Provide extends ComponentProvideOptions
+  mixins?: (infer Mixin extends ComponentOptionsMixin)[]
+  extends?: infer Extends extends ComponentOptionsMixin
+  setup?(props: any, ctx: any): infer SetupBindings
+  data?(vm: any): infer Data
+  __typeProps?: infer TypeProps
+  __typeEmits?: infer TypeEmits
+  __typeRefs?: infer TypeRefs
+  __typeEl?: infer TypeEl extends Element
+}
+  ? ComponentOptionsBase<
+      {},
+      SetupBindings,
+      Data,
+      Computed,
+      Methods,
+      Mixin,
+      Extends,
+      RuntimeEmitsOptions,
+      never,
+      never,
+      {},
+      never,
+      Slots,
+      LocalComponents & GlobalComponents,
+      Directives & GlobalDirectives,
+      Exposed,
+      Provide,
+      any,
+      any
+    > & {
+      props?: PropsOptions
 
-        /**
-         * #3468
-         *
-         * type-only, used to assist Mixin's type inference,
-         * typescript will try to simplify the inferred `Mixin` type,
-         * with the `__differentiator`, typescript won't be able to combine different mixins,
-         * because the `__differentiator` will be different
-         */
-        __differentiator?: keyof Data | keyof Computed | keyof Methods
+      /**
+       * #3468
+       *
+       * type-only, used to assist Mixin's type inference,
+       * typescript will try to simplify the inferred `Mixin` type,
+       * with the `__differentiator`, typescript won't be able to combine different mixins,
+       * because the `__differentiator` will be different
+       */
+      __differentiator?: keyof Data | keyof Computed | keyof Methods
 
-        new (...args: any[]): ComponentPublicInstance<
-          Readonly<
-            ExtractPropTypes<
+      new (...args: any[]): ComponentPublicInstance<
+        Readonly<
+          ExtractPropTypes<
+            ExtractMixinProps<Mixin> &
+              ExtractMixinProps<Extends> &
+              (unknown extends TypeProps
+                ? PropsOptions extends (infer Keys extends string)[]
+                  ? { [K in Keys]: null }
+                  : PropsOptions
+                : {})
+          > &
+            TypeProps &
+            EmitsToProps<
+              ExtractMixinEmits<Mixin> &
+                ExtractMixinEmits<Extends> &
+                ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits> &
+                TypeEmitsToOptions<
+                  string[] extends RuntimeEmitsOptions
+                    ? TypeEmits & {}
+                    : ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits> & {}
+                >
+            >
+        >,
+        ExtractMixinSetupBindings<Mixin> &
+          ExtractMixinSetupBindings<Extends> &
+          EnsureNonVoid<SetupBindings>,
+        ExtractMixinData<Mixin> &
+          ExtractMixinData<Extends> &
+          EnsureNonVoid<Data>,
+        ExtractMixinComputed<Mixin> &
+          ExtractMixinComputed<Extends> &
+          Computed & {},
+        ExtractMixinMethods<Mixin> &
+          ExtractMixinMethods<Extends> &
+          Methods & {},
+        ExtractMixinEmits<Mixin> &
+          ExtractMixinEmits<Extends> &
+          ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits>,
+        PublicProps,
+        MakeDefaultsOptional extends boolean
+          ? Defaults
+          : ExtractDefaultPropTypes<
               ExtractMixinProps<Mixin> &
                 ExtractMixinProps<Extends> &
-                (unknown extends TypeProps
-                  ? PropsOptions extends (infer Keys extends string)[]
-                    ? { [K in Keys]: null }
-                    : PropsOptions
-                  : {})
-            > &
-              TypeProps &
-              EmitsToProps<
-                ExtractMixinEmits<Mixin> &
-                  ExtractMixinEmits<Extends> &
-                  ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits> &
-                  TypeEmitsToOptions<
-                    string[] extends RuntimeEmitsOptions
-                      ? TypeEmits & {}
-                      : ResolveTypeEmits<
-                          RuntimeEmitsOptions & {},
-                          TypeEmits
-                        > & {}
-                  >
-              >
-          >,
-          ExtractMixinSetupBindings<Mixin> &
-            ExtractMixinSetupBindings<Extends> &
-            EnsureNonVoid<SetupBindings>,
-          ExtractMixinData<Mixin> &
-            ExtractMixinData<Extends> &
-            EnsureNonVoid<Data>,
-          ExtractMixinComputed<Mixin> &
-            ExtractMixinComputed<Extends> &
-            Computed & {},
-          ExtractMixinMethods<Mixin> &
-            ExtractMixinMethods<Extends> &
-            Methods & {},
-          ExtractMixinEmits<Mixin> &
-            ExtractMixinEmits<Extends> &
-            ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits>,
-          PublicProps,
-          MakeDefaultsOptional extends boolean
-            ? Defaults
-            : ExtractDefaultPropTypes<
-                ExtractMixinProps<Mixin> &
-                  ExtractMixinProps<Extends> &
-                  PropsOptions
-              >,
-          MakeDefaultsOptional extends boolean
-            ? MakeDefaultsOptional
-            : // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-              // user props types verbatim
-              unknown extends TypeProps
-              ? true
-              : false,
-          {},
-          {}, // InjectOptions
-          Slots & {},
-          Exposed & string,
-          TypeRefs & {},
-          TypeEl,
-          ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
-        >
-      }
-    : {})
+                PropsOptions
+            >,
+        MakeDefaultsOptional extends boolean
+          ? MakeDefaultsOptional
+          : // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+            // user props types verbatim
+            unknown extends TypeProps
+            ? true
+            : false,
+        {},
+        {}, // InjectOptions
+        Slots & {},
+        Exposed & string,
+        TypeRefs & {},
+        TypeEl,
+        ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
+      >
+    }
+  : {}
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
@@ -404,8 +418,8 @@ export function defineComponent<
     ObjectInjectOptions | InjectOptions | _InjectKeys[],
     never,
     Slots,
-    LocalComponents,
-    Directives,
+    Record<string, Component> | LocalComponents,
+    Record<string, Directive> | Directives,
     Exposed,
     Provide,
     InferredProps,
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index b21ece52e6a..84c7a9dcb04 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -116,7 +116,7 @@ export interface ComponentOptionsBase<
   Extends extends ComponentOptionsMixin,
   E extends EmitsOptions,
   _EE extends string = never,
-  Defaults = {},
+  _Defaults = never,
   I extends ComponentInjectOptions = {},
   _II extends string = never,
   S extends SlotsType = {},
@@ -153,8 +153,8 @@ export interface ComponentOptionsBase<
   // Luckily `render()` doesn't need any arguments nor does it care about return
   // type.
   render?: Function
-  components?: Record<string, Component> | LC
-  directives?: Record<string, Directive> | Directives
+  components?: LC
+  directives?: Directives
   inheritAttrs?: boolean
   emits?: E
   slots?: S
@@ -222,8 +222,6 @@ export interface ComponentOptionsBase<
   __isFragment?: never
   __isTeleport?: never
   __isSuspense?: never
-
-  __defaults?: Defaults
 }
 
 /**
@@ -268,8 +266,8 @@ export type ComponentOptions<
   I,
   II,
   S,
-  LC,
-  Directives,
+  Record<string, ComponentOptions> | LC,
+  Record<string, Directive> | Directives,
   Exposed,
   Provide
 > &
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 47b8fa6cd4e..6a8378f09f8 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -107,11 +107,11 @@ export type ExtractMixinComputed<T> = UnionToIntersection<
 >
 
 export type ExtractMixinData<T> = UnionToIntersection<
-  T extends { data?(): infer P } ? P : {}
+  T extends { data?(...args: any): infer P } ? P : {}
 >
 
 export type ExtractMixinSetupBindings<T> = UnionToIntersection<
-  T extends { setup?(): infer B } ? B : {}
+  T extends { setup?(...args: any): infer B } ? B : {}
 >
 
 export type EnsureNonVoid<T> = T extends void ? {} : T

From 52097b3b3b0d18e2063055404dea2a40339f10da Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 15:47:59 +0800
Subject: [PATCH 089/127] wip

---
 packages/runtime-core/src/componentOptions.ts | 6 +++---
 packages/runtime-core/src/index.ts            | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 84c7a9dcb04..f0b3b6af169 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -352,6 +352,9 @@ interface LegacyOptions<
 > {
   compatConfig?: CompatConfig
 
+  // allow any custom options
+  [key: string]: any
+
   data?: (vm: NoInfer<InternalInstance>) => D
   computed?: C
   methods?: M
@@ -385,9 +388,6 @@ interface LegacyOptions<
   renderTriggered?: DebuggerHook
   errorCaptured?: ErrorCapturedHook
 
-  // allow any custom options
-  [key: string]: any
-
   /**
    * runtime compile only
    * @deprecated use `compilerOptions.delimiters` instead.
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 9f57d89d098..d87082759c7 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -261,7 +261,6 @@ export type {
   ComponentInternalInstance,
   SetupContext,
   ComponentCustomProps,
-  ComponentInternalOptions,
   AllowedComponentProps,
   GlobalComponents,
   GlobalDirectives,

From a031024dc74104bdd7c821d082558647ac702957 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 15:59:19 +0800
Subject: [PATCH 090/127] wip

---
 packages/runtime-core/src/apiSetupHelpers.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index b03479d6a7e..0379fc10488 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -196,7 +196,16 @@ export function defineOptions<
   Mixin extends ComponentOptionsMixin = {},
   Extends extends ComponentOptionsMixin = {},
 >(
-  options?: {
+  options?: ComponentOptionsBase<
+    {},
+    RawBindings,
+    D,
+    C,
+    M,
+    Mixin,
+    Extends,
+    {}
+  > & {
     /**
      * setup should be defined via `<script setup>`.
      */
@@ -217,7 +226,7 @@ export function defineOptions<
      * slots should be defined via defineSlots().
      */
     slots?: never
-  } & ComponentOptionsBase<{}, RawBindings, D, C, M, Mixin, Extends, {}>,
+  },
 ): void {
   if (__DEV__) {
     warnRuntimeUsage(`defineOptions`)

From a60fe817189db553e08528e4c553f63986338cf7 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 16:16:15 +0800
Subject: [PATCH 091/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 19 ++----
 packages/runtime-core/src/componentOptions.ts | 58 ++++++++++++++-----
 packages/runtime-core/src/index.ts            |  1 +
 packages/runtime-dom/src/apiCustomElement.ts  |  8 +--
 4 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 26cf4bb9f7a..df93b7aa2fa 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -18,7 +18,7 @@ import type {
 import type {
   ComponentInjectOptions,
   ComponentOptions,
-  ComponentOptionsBase,
+  ComponentOptionsBase2,
   ComponentOptionsMixin,
   ComponentProvideOptions,
   ComputedOptions,
@@ -131,8 +131,8 @@ type InferComponentOptions<
   __typeRefs?: infer TypeRefs
   __typeEl?: infer TypeEl extends Element
 }
-  ? ComponentOptionsBase<
-      {},
+  ? ComponentOptionsBase2<
+      any,
       SetupBindings,
       Data,
       Computed,
@@ -140,17 +140,12 @@ type InferComponentOptions<
       Mixin,
       Extends,
       RuntimeEmitsOptions,
-      never,
-      never,
       {},
-      never,
       Slots,
       LocalComponents & GlobalComponents,
       Directives & GlobalDirectives,
       Exposed,
-      Provide,
-      any,
-      any
+      Provide
     > & {
       props?: PropsOptions
 
@@ -404,7 +399,7 @@ export function defineComponent<
      * @private for language-tools use only
      */
     __typeEl?: TypeEl
-  } & ComponentOptionsBase<
+  } & ComponentOptionsBase2<
     InferredProps,
     SetupBindings,
     Data,
@@ -413,16 +408,12 @@ export function defineComponent<
     Mixin,
     Extends,
     ObjectEmitsOptions | (RawEmitsOptions & ThisType<void>) | _EmitsKeys[],
-    never,
-    never,
     ObjectInjectOptions | InjectOptions | _InjectKeys[],
-    never,
     Slots,
     Record<string, Component> | LocalComponents,
     Record<string, Directive> | Directives,
     Exposed,
     Provide,
-    InferredProps,
     InternalInstance
   > &
     ThisType<
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index f0b3b6af169..37ed497389d 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -124,25 +124,57 @@ export interface ComponentOptionsBase<
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  ResolvedProps = Props &
-    Prettify<
-      ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
-    >,
-  InternalInstance = CreateComponentPublicInstanceWithMixins<
-    Props,
-    {},
-    {},
-    {},
-    MethodOptions,
+> extends ComponentOptionsBase2<
+    Props &
+      Prettify<
+        ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+      >,
+    RawBindings,
+    D,
+    C,
+    M,
     Mixin,
-    Extends
-  >,
+    Extends,
+    E,
+    I,
+    S,
+    LC,
+    Directives,
+    Exposed,
+    Provide,
+    CreateComponentPublicInstanceWithMixins<
+      Props,
+      {},
+      {},
+      {},
+      MethodOptions,
+      Mixin,
+      Extends
+    >
+  > {}
+
+export interface ComponentOptionsBase2<
+  Props,
+  RawBindings,
+  D,
+  C extends ComputedOptions,
+  M extends MethodOptions,
+  Mixin extends ComponentOptionsMixin,
+  Extends extends ComponentOptionsMixin,
+  E extends EmitsOptions,
+  I extends ComponentInjectOptions = {},
+  S extends SlotsType = {},
+  LC extends Record<string, Component> = {},
+  Directives extends Record<string, Directive> = {},
+  Exposed extends string = string,
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
+  InternalInstance = any,
 > extends LegacyOptions<InternalInstance, D, C, M, Mixin, Extends, I, Provide>,
     ComponentInternalOptions,
     ComponentCustomOptions {
   setup?: (
     this: void,
-    props: LooseRequired<ResolvedProps>,
+    props: LooseRequired<Props>,
     ctx: SetupContext<E, S>,
   ) => Promise<RawBindings> | RawBindings | RenderFunction | void
   name?: string
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index d87082759c7..2c4ac458d4c 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -277,6 +277,7 @@ export type {
   ComponentOptionsMixin,
   ComponentCustomOptions,
   ComponentOptionsBase,
+  ComponentOptionsBase2,
   ComponentProvideOptions,
   RenderFunction,
   MethodOptions,
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index aa6158cf09a..2c7b6cd8715 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -6,7 +6,7 @@ import {
   type ComponentInternalInstance,
   type ComponentObjectPropsOptions,
   type ComponentOptions,
-  type ComponentOptionsBase,
+  type ComponentOptionsBase2,
   type ComponentProvideOptions,
   type ComputedOptions,
   type ConcreteComponent,
@@ -132,7 +132,7 @@ export function defineCustomElement<
       | ComponentObjectPropsOptions
       | (RuntimePropsOptions & ThisType<void>)
       | _PropsKeys[]
-  } & ComponentOptionsBase<
+  } & ComponentOptionsBase2<
       InferredProps,
       SetupBindings,
       Data,
@@ -143,16 +143,12 @@ export function defineCustomElement<
       | ObjectEmitsOptions
       | (RuntimeEmitsOptions & ThisType<void>)
       | _EmitsKeys[],
-      never,
-      never,
       ObjectInjectOptions | InjectOptions | _InjectKeys[],
-      never,
       Slots,
       LocalComponents,
       Directives,
       Exposed,
       Provide,
-      InferredProps,
       InternalInstance
     > &
     ThisType<NoInfer<InternalInstance>>,

From 9d0882b215241dc1c1307f733db3b958db683c9a Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 16:25:14 +0800
Subject: [PATCH 092/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 12 +++-
 packages/runtime-core/src/componentOptions.ts | 59 ++++---------------
 packages/runtime-core/src/index.ts            |  1 -
 packages/runtime-dom/src/apiCustomElement.ts  |  7 ++-
 4 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index df93b7aa2fa..34396602ca0 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -18,7 +18,7 @@ import type {
 import type {
   ComponentInjectOptions,
   ComponentOptions,
-  ComponentOptionsBase2,
+  ComponentOptionsBase,
   ComponentOptionsMixin,
   ComponentProvideOptions,
   ComputedOptions,
@@ -131,7 +131,7 @@ type InferComponentOptions<
   __typeRefs?: infer TypeRefs
   __typeEl?: infer TypeEl extends Element
 }
-  ? ComponentOptionsBase2<
+  ? ComponentOptionsBase<
       any,
       SetupBindings,
       Data,
@@ -140,7 +140,10 @@ type InferComponentOptions<
       Mixin,
       Extends,
       RuntimeEmitsOptions,
+      never,
+      never,
       {},
+      never,
       Slots,
       LocalComponents & GlobalComponents,
       Directives & GlobalDirectives,
@@ -399,7 +402,7 @@ export function defineComponent<
      * @private for language-tools use only
      */
     __typeEl?: TypeEl
-  } & ComponentOptionsBase2<
+  } & ComponentOptionsBase<
     InferredProps,
     SetupBindings,
     Data,
@@ -408,7 +411,10 @@ export function defineComponent<
     Mixin,
     Extends,
     ObjectEmitsOptions | (RawEmitsOptions & ThisType<void>) | _EmitsKeys[],
+    never,
+    never,
     ObjectInjectOptions | InjectOptions | _InjectKeys[],
+    never,
     Slots,
     Record<string, Component> | LocalComponents,
     Record<string, Directive> | Directives,
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 37ed497389d..a01474081cc 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -64,7 +64,6 @@ import type { Directive } from './directives'
 import {
   type ComponentPublicInstance,
   type CreateComponentPublicInstanceWithMixins,
-  type ExtractMixinProps,
   isReservedPrefix,
 } from './componentPublicInstance'
 import { warn } from './warning'
@@ -115,60 +114,24 @@ export interface ComponentOptionsBase<
   Mixin extends ComponentOptionsMixin,
   Extends extends ComponentOptionsMixin,
   E extends EmitsOptions,
-  _EE extends string = never,
-  _Defaults = never,
+  _EE extends string = string,
+  _Defaults = {},
   I extends ComponentInjectOptions = {},
-  _II extends string = never,
+  _II extends string = string,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-> extends ComponentOptionsBase2<
-    Props &
-      Prettify<
-        ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
-      >,
-    RawBindings,
-    D,
-    C,
-    M,
+  InternalInstance = CreateComponentPublicInstanceWithMixins<
+    Props,
+    {},
+    {},
+    {},
+    MethodOptions,
     Mixin,
-    Extends,
-    E,
-    I,
-    S,
-    LC,
-    Directives,
-    Exposed,
-    Provide,
-    CreateComponentPublicInstanceWithMixins<
-      Props,
-      {},
-      {},
-      {},
-      MethodOptions,
-      Mixin,
-      Extends
-    >
-  > {}
-
-export interface ComponentOptionsBase2<
-  Props,
-  RawBindings,
-  D,
-  C extends ComputedOptions,
-  M extends MethodOptions,
-  Mixin extends ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin,
-  E extends EmitsOptions,
-  I extends ComponentInjectOptions = {},
-  S extends SlotsType = {},
-  LC extends Record<string, Component> = {},
-  Directives extends Record<string, Directive> = {},
-  Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  InternalInstance = any,
+    Extends
+  >,
 > extends LegacyOptions<InternalInstance, D, C, M, Mixin, Extends, I, Provide>,
     ComponentInternalOptions,
     ComponentCustomOptions {
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 2c4ac458d4c..d87082759c7 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -277,7 +277,6 @@ export type {
   ComponentOptionsMixin,
   ComponentCustomOptions,
   ComponentOptionsBase,
-  ComponentOptionsBase2,
   ComponentProvideOptions,
   RenderFunction,
   MethodOptions,
diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts
index 2c7b6cd8715..03e6e3f75a3 100644
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@ -6,7 +6,7 @@ import {
   type ComponentInternalInstance,
   type ComponentObjectPropsOptions,
   type ComponentOptions,
-  type ComponentOptionsBase2,
+  type ComponentOptionsBase,
   type ComponentProvideOptions,
   type ComputedOptions,
   type ConcreteComponent,
@@ -132,7 +132,7 @@ export function defineCustomElement<
       | ComponentObjectPropsOptions
       | (RuntimePropsOptions & ThisType<void>)
       | _PropsKeys[]
-  } & ComponentOptionsBase2<
+  } & ComponentOptionsBase<
       InferredProps,
       SetupBindings,
       Data,
@@ -143,7 +143,10 @@ export function defineCustomElement<
       | ObjectEmitsOptions
       | (RuntimeEmitsOptions & ThisType<void>)
       | _EmitsKeys[],
+      never,
+      never,
       ObjectInjectOptions | InjectOptions | _InjectKeys[],
+      never,
       Slots,
       LocalComponents,
       Directives,

From 29b44c221f4f97fc8c246764ed8c53bb8f6c6912 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 16:26:58 +0800
Subject: [PATCH 093/127] wip

---
 packages/runtime-core/src/componentOptions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index a01474081cc..7062cf15619 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -114,10 +114,10 @@ export interface ComponentOptionsBase<
   Mixin extends ComponentOptionsMixin,
   Extends extends ComponentOptionsMixin,
   E extends EmitsOptions,
-  _EE extends string = string,
-  _Defaults = {},
+  EE extends string = string,
+  Defaults = {},
   I extends ComponentInjectOptions = {},
-  _II extends string = string,
+  II extends string = string,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},

From 74a2a29d1aa3b3b147cfbe42c4b88c3b214b0f5f Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 16:33:23 +0800
Subject: [PATCH 094/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 292 +++++++++---------
 1 file changed, 147 insertions(+), 145 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 34396602ca0..a0daaf83676 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -80,27 +80,27 @@ export type DefineComponent<
   'props' extends keyof NormalizePropsOptions<OptionsOrPropsOrPropOptions>
     ? OptionsOrPropsOrPropOptions
     : {
-        props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+        props: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? NormalizePropsOptions<OptionsOrPropsOrPropOptions>
           : {}
-        emits?: string extends EE ? NormalizeEmitsOptions<E> : EE[]
-        computed?: C
-        methods?: M
-        mixins?: Mixin[]
-        extends?: Extends
-        inject?: {}
-        slots?: S
-        components?: LC
-        directives?: Directives
-        expose?: Exposed[]
-        provide?: Provide
-        setup?: (props: any, ctx: SetupContext) => RawBindings & {}
-        data?: (vm: any) => D & {}
-        __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+        emits: string extends EE ? NormalizeEmitsOptions<E> : EE[]
+        computed: C
+        methods: M
+        mixins: Mixin[]
+        extends: Extends
+        inject: {}
+        slots: S
+        components: LC
+        directives: Directives
+        expose: Exposed[]
+        provide: Provide
+        setup: (props: any, ctx: SetupContext) => RawBindings & {}
+        data: (vm: any) => D & {}
+        __typeProps: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? unknown
           : OptionsOrPropsOrPropOptions
-        __typeRefs?: TypeRefs
-        __typeEl?: TypeEl
+        __typeRefs: TypeRefs
+        __typeEl: TypeEl
       },
   'props' extends keyof NormalizePropsOptions<OptionsOrPropsOrPropOptions>
     ? unknown
@@ -112,119 +112,121 @@ type InferComponentOptions<
   T,
   MakeDefaultsOptional extends boolean | unknown,
   Defaults = {},
-> = T extends {
-  props?: infer PropsOptions
-  emits?: infer RuntimeEmitsOptions extends EmitsOptions
-  components?: infer LocalComponents extends Record<string, Component>
-  directives?: infer Directives extends Record<string, Directive>
-  slots?: infer Slots extends SlotsType
-  expose?: (infer Exposed extends string)[]
-  computed?: infer Computed extends ComputedOptions
-  methods?: infer Methods extends MethodOptions
-  provide?: infer Provide extends ComponentProvideOptions
-  mixins?: (infer Mixin extends ComponentOptionsMixin)[]
-  extends?: infer Extends extends ComponentOptionsMixin
-  setup?(props: any, ctx: any): infer SetupBindings
-  data?(vm: any): infer Data
-  __typeProps?: infer TypeProps
-  __typeEmits?: infer TypeEmits
-  __typeRefs?: infer TypeRefs
-  __typeEl?: infer TypeEl extends Element
-}
-  ? ComponentOptionsBase<
-      any,
-      SetupBindings,
-      Data,
-      Computed,
-      Methods,
-      Mixin,
-      Extends,
-      RuntimeEmitsOptions,
-      never,
-      never,
-      {},
-      never,
-      Slots,
-      LocalComponents & GlobalComponents,
-      Directives & GlobalDirectives,
-      Exposed,
-      Provide
-    > & {
-      props?: PropsOptions
-
-      /**
-       * #3468
-       *
-       * type-only, used to assist Mixin's type inference,
-       * typescript will try to simplify the inferred `Mixin` type,
-       * with the `__differentiator`, typescript won't be able to combine different mixins,
-       * because the `__differentiator` will be different
-       */
-      __differentiator?: keyof Data | keyof Computed | keyof Methods
+> = Pick<T & { props: unknown }, 'props'> &
+  (T extends {
+    props?: infer PropsOptions
+    emits?: infer RuntimeEmitsOptions extends EmitsOptions
+    components?: infer LocalComponents extends Record<string, Component>
+    directives?: infer Directives extends Record<string, Directive>
+    slots?: infer Slots extends SlotsType
+    expose?: (infer Exposed extends string)[]
+    computed?: infer Computed extends ComputedOptions
+    methods?: infer Methods extends MethodOptions
+    provide?: infer Provide extends ComponentProvideOptions
+    mixins?: (infer Mixin extends ComponentOptionsMixin)[]
+    extends?: infer Extends extends ComponentOptionsMixin
+    setup?(props: any, ctx: any): infer SetupBindings
+    data?(vm: any): infer Data
+    __typeProps?: infer TypeProps
+    __typeEmits?: infer TypeEmits
+    __typeRefs?: infer TypeRefs
+    __typeEl?: infer TypeEl extends Element
+  }
+    ? ComponentOptionsBase<
+        any,
+        SetupBindings,
+        Data,
+        Computed,
+        Methods,
+        Mixin,
+        Extends,
+        RuntimeEmitsOptions,
+        never,
+        never,
+        {},
+        never,
+        Slots,
+        LocalComponents & GlobalComponents,
+        Directives & GlobalDirectives,
+        Exposed,
+        Provide
+      > & {
+        /**
+         * #3468
+         *
+         * type-only, used to assist Mixin's type inference,
+         * typescript will try to simplify the inferred `Mixin` type,
+         * with the `__differentiator`, typescript won't be able to combine different mixins,
+         * because the `__differentiator` will be different
+         */
+        __differentiator?: keyof Data | keyof Computed | keyof Methods
 
-      new (...args: any[]): ComponentPublicInstance<
-        Readonly<
-          ExtractPropTypes<
-            ExtractMixinProps<Mixin> &
-              ExtractMixinProps<Extends> &
-              (unknown extends TypeProps
-                ? PropsOptions extends (infer Keys extends string)[]
-                  ? { [K in Keys]: null }
-                  : PropsOptions
-                : {})
-          > &
-            TypeProps &
-            EmitsToProps<
-              ExtractMixinEmits<Mixin> &
-                ExtractMixinEmits<Extends> &
-                ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits> &
-                TypeEmitsToOptions<
-                  string[] extends RuntimeEmitsOptions
-                    ? TypeEmits & {}
-                    : ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits> & {}
-                >
-            >
-        >,
-        ExtractMixinSetupBindings<Mixin> &
-          ExtractMixinSetupBindings<Extends> &
-          EnsureNonVoid<SetupBindings>,
-        ExtractMixinData<Mixin> &
-          ExtractMixinData<Extends> &
-          EnsureNonVoid<Data>,
-        ExtractMixinComputed<Mixin> &
-          ExtractMixinComputed<Extends> &
-          Computed & {},
-        ExtractMixinMethods<Mixin> &
-          ExtractMixinMethods<Extends> &
-          Methods & {},
-        ExtractMixinEmits<Mixin> &
-          ExtractMixinEmits<Extends> &
-          ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits>,
-        PublicProps,
-        MakeDefaultsOptional extends boolean
-          ? Defaults
-          : ExtractDefaultPropTypes<
+        new (...args: any[]): ComponentPublicInstance<
+          Readonly<
+            ExtractPropTypes<
               ExtractMixinProps<Mixin> &
                 ExtractMixinProps<Extends> &
-                PropsOptions
-            >,
-        MakeDefaultsOptional extends boolean
-          ? MakeDefaultsOptional
-          : // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-            // user props types verbatim
-            unknown extends TypeProps
-            ? true
-            : false,
-        {},
-        {}, // InjectOptions
-        Slots & {},
-        Exposed & string,
-        TypeRefs & {},
-        TypeEl,
-        ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
-      >
-    }
-  : {}
+                (unknown extends TypeProps
+                  ? PropsOptions extends (infer Keys extends string)[]
+                    ? { [K in Keys]: null }
+                    : PropsOptions
+                  : {})
+            > &
+              TypeProps &
+              EmitsToProps<
+                ExtractMixinEmits<Mixin> &
+                  ExtractMixinEmits<Extends> &
+                  ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits> &
+                  TypeEmitsToOptions<
+                    string[] extends RuntimeEmitsOptions
+                      ? TypeEmits & {}
+                      : ResolveTypeEmits<
+                          RuntimeEmitsOptions & {},
+                          TypeEmits
+                        > & {}
+                  >
+              >
+          >,
+          ExtractMixinSetupBindings<Mixin> &
+            ExtractMixinSetupBindings<Extends> &
+            EnsureNonVoid<SetupBindings>,
+          ExtractMixinData<Mixin> &
+            ExtractMixinData<Extends> &
+            EnsureNonVoid<Data>,
+          ExtractMixinComputed<Mixin> &
+            ExtractMixinComputed<Extends> &
+            Computed & {},
+          ExtractMixinMethods<Mixin> &
+            ExtractMixinMethods<Extends> &
+            Methods & {},
+          ExtractMixinEmits<Mixin> &
+            ExtractMixinEmits<Extends> &
+            ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits>,
+          PublicProps,
+          MakeDefaultsOptional extends boolean
+            ? Defaults
+            : ExtractDefaultPropTypes<
+                ExtractMixinProps<Mixin> &
+                  ExtractMixinProps<Extends> &
+                  PropsOptions
+              >,
+          MakeDefaultsOptional extends boolean
+            ? MakeDefaultsOptional
+            : // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+              // user props types verbatim
+              unknown extends TypeProps
+              ? true
+              : false,
+          {},
+          {}, // InjectOptions
+          Slots & {},
+          Exposed & string,
+          TypeRefs & {},
+          TypeEl,
+          ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
+        >
+      }
+    : {})
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
@@ -429,24 +431,24 @@ export function defineComponent<
     >,
 ): DefineComponent<
   {
-    props?: NormalizedProps
-    emits?: string[] extends NormalizedEmits ? {} : NormalizedEmits
-    components?: LocalComponents
-    directives?: Directives
-    slots?: Slots
-    expose?: Exposed[]
-    computed?: Computed
-    methods?: Methods
-    provide?: Provide
-    inject?: InjectOptions
-    mixins?: Mixin[]
-    extends?: Extends
-    setup?(): SetupBindings
-    data?(): Data
-    __typeProps?: TypeProps
-    __typeEmits?: TypeEmits
-    __typeRefs?: TypeRefs
-    __typeEl?: TypeEl
+    props: NormalizedProps
+    emits: string[] extends NormalizedEmits ? {} : NormalizedEmits
+    components: LocalComponents
+    directives: Directives
+    slots: Slots
+    expose: Exposed[]
+    computed: Computed
+    methods: Methods
+    provide: Provide
+    inject: InjectOptions
+    mixins: Mixin[]
+    extends: Extends
+    setup(): SetupBindings
+    data(): Data
+    __typeProps: TypeProps
+    __typeEmits: TypeEmits
+    __typeRefs: TypeRefs
+    __typeEl: TypeEl
   },
   any,
   any,

From 2c03b8fdeaf5175d8939002b014bfb12f2d4ab2f Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 16:48:28 +0800
Subject: [PATCH 095/127] Revert "wip"

This reverts commit 74a2a29d1aa3b3b147cfbe42c4b88c3b214b0f5f.
---
 .../runtime-core/src/apiDefineComponent.ts    | 292 +++++++++---------
 1 file changed, 145 insertions(+), 147 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index a0daaf83676..34396602ca0 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -80,27 +80,27 @@ export type DefineComponent<
   'props' extends keyof NormalizePropsOptions<OptionsOrPropsOrPropOptions>
     ? OptionsOrPropsOrPropOptions
     : {
-        props: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+        props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? NormalizePropsOptions<OptionsOrPropsOrPropOptions>
           : {}
-        emits: string extends EE ? NormalizeEmitsOptions<E> : EE[]
-        computed: C
-        methods: M
-        mixins: Mixin[]
-        extends: Extends
-        inject: {}
-        slots: S
-        components: LC
-        directives: Directives
-        expose: Exposed[]
-        provide: Provide
-        setup: (props: any, ctx: SetupContext) => RawBindings & {}
-        data: (vm: any) => D & {}
-        __typeProps: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+        emits?: string extends EE ? NormalizeEmitsOptions<E> : EE[]
+        computed?: C
+        methods?: M
+        mixins?: Mixin[]
+        extends?: Extends
+        inject?: {}
+        slots?: S
+        components?: LC
+        directives?: Directives
+        expose?: Exposed[]
+        provide?: Provide
+        setup?: (props: any, ctx: SetupContext) => RawBindings & {}
+        data?: (vm: any) => D & {}
+        __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
           ? unknown
           : OptionsOrPropsOrPropOptions
-        __typeRefs: TypeRefs
-        __typeEl: TypeEl
+        __typeRefs?: TypeRefs
+        __typeEl?: TypeEl
       },
   'props' extends keyof NormalizePropsOptions<OptionsOrPropsOrPropOptions>
     ? unknown
@@ -112,121 +112,119 @@ type InferComponentOptions<
   T,
   MakeDefaultsOptional extends boolean | unknown,
   Defaults = {},
-> = Pick<T & { props: unknown }, 'props'> &
-  (T extends {
-    props?: infer PropsOptions
-    emits?: infer RuntimeEmitsOptions extends EmitsOptions
-    components?: infer LocalComponents extends Record<string, Component>
-    directives?: infer Directives extends Record<string, Directive>
-    slots?: infer Slots extends SlotsType
-    expose?: (infer Exposed extends string)[]
-    computed?: infer Computed extends ComputedOptions
-    methods?: infer Methods extends MethodOptions
-    provide?: infer Provide extends ComponentProvideOptions
-    mixins?: (infer Mixin extends ComponentOptionsMixin)[]
-    extends?: infer Extends extends ComponentOptionsMixin
-    setup?(props: any, ctx: any): infer SetupBindings
-    data?(vm: any): infer Data
-    __typeProps?: infer TypeProps
-    __typeEmits?: infer TypeEmits
-    __typeRefs?: infer TypeRefs
-    __typeEl?: infer TypeEl extends Element
-  }
-    ? ComponentOptionsBase<
-        any,
-        SetupBindings,
-        Data,
-        Computed,
-        Methods,
-        Mixin,
-        Extends,
-        RuntimeEmitsOptions,
-        never,
-        never,
-        {},
-        never,
-        Slots,
-        LocalComponents & GlobalComponents,
-        Directives & GlobalDirectives,
-        Exposed,
-        Provide
-      > & {
-        /**
-         * #3468
-         *
-         * type-only, used to assist Mixin's type inference,
-         * typescript will try to simplify the inferred `Mixin` type,
-         * with the `__differentiator`, typescript won't be able to combine different mixins,
-         * because the `__differentiator` will be different
-         */
-        __differentiator?: keyof Data | keyof Computed | keyof Methods
+> = T extends {
+  props?: infer PropsOptions
+  emits?: infer RuntimeEmitsOptions extends EmitsOptions
+  components?: infer LocalComponents extends Record<string, Component>
+  directives?: infer Directives extends Record<string, Directive>
+  slots?: infer Slots extends SlotsType
+  expose?: (infer Exposed extends string)[]
+  computed?: infer Computed extends ComputedOptions
+  methods?: infer Methods extends MethodOptions
+  provide?: infer Provide extends ComponentProvideOptions
+  mixins?: (infer Mixin extends ComponentOptionsMixin)[]
+  extends?: infer Extends extends ComponentOptionsMixin
+  setup?(props: any, ctx: any): infer SetupBindings
+  data?(vm: any): infer Data
+  __typeProps?: infer TypeProps
+  __typeEmits?: infer TypeEmits
+  __typeRefs?: infer TypeRefs
+  __typeEl?: infer TypeEl extends Element
+}
+  ? ComponentOptionsBase<
+      any,
+      SetupBindings,
+      Data,
+      Computed,
+      Methods,
+      Mixin,
+      Extends,
+      RuntimeEmitsOptions,
+      never,
+      never,
+      {},
+      never,
+      Slots,
+      LocalComponents & GlobalComponents,
+      Directives & GlobalDirectives,
+      Exposed,
+      Provide
+    > & {
+      props?: PropsOptions
 
-        new (...args: any[]): ComponentPublicInstance<
-          Readonly<
-            ExtractPropTypes<
+      /**
+       * #3468
+       *
+       * type-only, used to assist Mixin's type inference,
+       * typescript will try to simplify the inferred `Mixin` type,
+       * with the `__differentiator`, typescript won't be able to combine different mixins,
+       * because the `__differentiator` will be different
+       */
+      __differentiator?: keyof Data | keyof Computed | keyof Methods
+
+      new (...args: any[]): ComponentPublicInstance<
+        Readonly<
+          ExtractPropTypes<
+            ExtractMixinProps<Mixin> &
+              ExtractMixinProps<Extends> &
+              (unknown extends TypeProps
+                ? PropsOptions extends (infer Keys extends string)[]
+                  ? { [K in Keys]: null }
+                  : PropsOptions
+                : {})
+          > &
+            TypeProps &
+            EmitsToProps<
+              ExtractMixinEmits<Mixin> &
+                ExtractMixinEmits<Extends> &
+                ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits> &
+                TypeEmitsToOptions<
+                  string[] extends RuntimeEmitsOptions
+                    ? TypeEmits & {}
+                    : ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits> & {}
+                >
+            >
+        >,
+        ExtractMixinSetupBindings<Mixin> &
+          ExtractMixinSetupBindings<Extends> &
+          EnsureNonVoid<SetupBindings>,
+        ExtractMixinData<Mixin> &
+          ExtractMixinData<Extends> &
+          EnsureNonVoid<Data>,
+        ExtractMixinComputed<Mixin> &
+          ExtractMixinComputed<Extends> &
+          Computed & {},
+        ExtractMixinMethods<Mixin> &
+          ExtractMixinMethods<Extends> &
+          Methods & {},
+        ExtractMixinEmits<Mixin> &
+          ExtractMixinEmits<Extends> &
+          ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits>,
+        PublicProps,
+        MakeDefaultsOptional extends boolean
+          ? Defaults
+          : ExtractDefaultPropTypes<
               ExtractMixinProps<Mixin> &
                 ExtractMixinProps<Extends> &
-                (unknown extends TypeProps
-                  ? PropsOptions extends (infer Keys extends string)[]
-                    ? { [K in Keys]: null }
-                    : PropsOptions
-                  : {})
-            > &
-              TypeProps &
-              EmitsToProps<
-                ExtractMixinEmits<Mixin> &
-                  ExtractMixinEmits<Extends> &
-                  ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits> &
-                  TypeEmitsToOptions<
-                    string[] extends RuntimeEmitsOptions
-                      ? TypeEmits & {}
-                      : ResolveTypeEmits<
-                          RuntimeEmitsOptions & {},
-                          TypeEmits
-                        > & {}
-                  >
-              >
-          >,
-          ExtractMixinSetupBindings<Mixin> &
-            ExtractMixinSetupBindings<Extends> &
-            EnsureNonVoid<SetupBindings>,
-          ExtractMixinData<Mixin> &
-            ExtractMixinData<Extends> &
-            EnsureNonVoid<Data>,
-          ExtractMixinComputed<Mixin> &
-            ExtractMixinComputed<Extends> &
-            Computed & {},
-          ExtractMixinMethods<Mixin> &
-            ExtractMixinMethods<Extends> &
-            Methods & {},
-          ExtractMixinEmits<Mixin> &
-            ExtractMixinEmits<Extends> &
-            ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits>,
-          PublicProps,
-          MakeDefaultsOptional extends boolean
-            ? Defaults
-            : ExtractDefaultPropTypes<
-                ExtractMixinProps<Mixin> &
-                  ExtractMixinProps<Extends> &
-                  PropsOptions
-              >,
-          MakeDefaultsOptional extends boolean
-            ? MakeDefaultsOptional
-            : // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-              // user props types verbatim
-              unknown extends TypeProps
-              ? true
-              : false,
-          {},
-          {}, // InjectOptions
-          Slots & {},
-          Exposed & string,
-          TypeRefs & {},
-          TypeEl,
-          ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
-        >
-      }
-    : {})
+                PropsOptions
+            >,
+        MakeDefaultsOptional extends boolean
+          ? MakeDefaultsOptional
+          : // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+            // user props types verbatim
+            unknown extends TypeProps
+            ? true
+            : false,
+        {},
+        {}, // InjectOptions
+        Slots & {},
+        Exposed & string,
+        TypeRefs & {},
+        TypeEl,
+        ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
+      >
+    }
+  : {}
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
@@ -431,24 +429,24 @@ export function defineComponent<
     >,
 ): DefineComponent<
   {
-    props: NormalizedProps
-    emits: string[] extends NormalizedEmits ? {} : NormalizedEmits
-    components: LocalComponents
-    directives: Directives
-    slots: Slots
-    expose: Exposed[]
-    computed: Computed
-    methods: Methods
-    provide: Provide
-    inject: InjectOptions
-    mixins: Mixin[]
-    extends: Extends
-    setup(): SetupBindings
-    data(): Data
-    __typeProps: TypeProps
-    __typeEmits: TypeEmits
-    __typeRefs: TypeRefs
-    __typeEl: TypeEl
+    props?: NormalizedProps
+    emits?: string[] extends NormalizedEmits ? {} : NormalizedEmits
+    components?: LocalComponents
+    directives?: Directives
+    slots?: Slots
+    expose?: Exposed[]
+    computed?: Computed
+    methods?: Methods
+    provide?: Provide
+    inject?: InjectOptions
+    mixins?: Mixin[]
+    extends?: Extends
+    setup?(): SetupBindings
+    data?(): Data
+    __typeProps?: TypeProps
+    __typeEmits?: TypeEmits
+    __typeRefs?: TypeRefs
+    __typeEl?: TypeEl
   },
   any,
   any,

From ed9d6647ebad54ea8bea5bb0af0f904542471db4 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 18:43:37 +0800
Subject: [PATCH 096/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 276 +++++++++---------
 packages/runtime-core/src/index.ts            |   1 +
 2 files changed, 147 insertions(+), 130 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 34396602ca0..980b4c8a80c 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -65,8 +65,8 @@ export type DefineComponent<
   Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions = {},
   EE extends string = string,
-  _PP = never,
-  _Props = never,
+  PP = never,
+  Props = never,
   Defaults = ExtractDefaultPropTypes<OptionsOrPropsOrPropOptions>,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
@@ -76,54 +76,15 @@ export type DefineComponent<
   MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = InferComponentOptions<
-  'props' extends keyof NormalizePropsOptions<OptionsOrPropsOrPropOptions>
-    ? OptionsOrPropsOrPropOptions
-    : {
-        props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
-          ? NormalizePropsOptions<OptionsOrPropsOrPropOptions>
-          : {}
-        emits?: string extends EE ? NormalizeEmitsOptions<E> : EE[]
-        computed?: C
-        methods?: M
-        mixins?: Mixin[]
-        extends?: Extends
-        inject?: {}
-        slots?: S
-        components?: LC
-        directives?: Directives
-        expose?: Exposed[]
-        provide?: Provide
-        setup?: (props: any, ctx: SetupContext) => RawBindings & {}
-        data?: (vm: any) => D & {}
-        __typeProps?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
-          ? unknown
-          : OptionsOrPropsOrPropOptions
-        __typeRefs?: TypeRefs
-        __typeEl?: TypeEl
-      },
-  'props' extends keyof NormalizePropsOptions<OptionsOrPropsOrPropOptions>
-    ? unknown
-    : MakeDefaultsOptional,
-  Defaults
->
-
-type InferComponentOptions<
-  T,
-  MakeDefaultsOptional extends boolean | unknown,
-  Defaults = {},
-> = T extends {
+> = OptionsOrPropsOrPropOptions extends {
   props?: infer PropsOptions
-  emits?: infer RuntimeEmitsOptions extends EmitsOptions
-  components?: infer LocalComponents extends Record<string, Component>
-  directives?: infer Directives extends Record<string, Directive>
-  slots?: infer Slots extends SlotsType
-  expose?: (infer Exposed extends string)[]
-  computed?: infer Computed extends ComputedOptions
-  methods?: infer Methods extends MethodOptions
-  provide?: infer Provide extends ComponentProvideOptions
-  mixins?: (infer Mixin extends ComponentOptionsMixin)[]
-  extends?: infer Extends extends ComponentOptionsMixin
+  emits?: infer RuntimeEmitsOptions
+  slots?: infer Slots
+  expose?: (infer Exposed)[]
+  computed?: infer Computed
+  methods?: infer Methods
+  mixins?: (infer Mixin)[]
+  extends?: infer Extends
   setup?(props: any, ctx: any): infer SetupBindings
   data?(vm: any): infer Data
   __typeProps?: infer TypeProps
@@ -131,100 +92,155 @@ type InferComponentOptions<
   __typeRefs?: infer TypeRefs
   __typeEl?: infer TypeEl extends Element
 }
-  ? ComponentOptionsBase<
+  ? OptionsOrPropsOrPropOptions & {
+      components?: GlobalComponents
+      directives?: GlobalDirectives
+    } & Omit<
+        ComponentOptionsBase<any, any, any, any, any, any, any, any>,
+        keyof OptionsOrPropsOrPropOptions
+      > &
+      InferComponentOptions<
+        TypeProps,
+        TypeEmits,
+        TypeRefs & {},
+        TypeEl,
+        PropsOptions & {},
+        RuntimeEmitsOptions & {},
+        Data,
+        SetupBindings,
+        Computed & {},
+        Methods & {},
+        Mixin & {},
+        Extends & {},
+        Slots & {},
+        Exposed & string,
+        // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+        // user props types verbatim
+        unknown extends TypeProps ? true : false,
+        ExtractDefaultPropTypes<
+          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
+        >
+      >
+  : {
+      props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+        ? unknown
+        : OptionsOrPropsOrPropOptions
+    } & ComponentOptionsBase<
       any,
-      SetupBindings,
-      Data,
-      Computed,
-      Methods,
+      RawBindings,
+      D,
+      C,
+      M,
       Mixin,
       Extends,
-      RuntimeEmitsOptions,
+      E,
       never,
       never,
       {},
       never,
-      Slots,
-      LocalComponents & GlobalComponents,
+      S,
+      LC & GlobalComponents,
       Directives & GlobalDirectives,
       Exposed,
       Provide
-    > & {
-      props?: PropsOptions
-
-      /**
-       * #3468
-       *
-       * type-only, used to assist Mixin's type inference,
-       * typescript will try to simplify the inferred `Mixin` type,
-       * with the `__differentiator`, typescript won't be able to combine different mixins,
-       * because the `__differentiator` will be different
-       */
-      __differentiator?: keyof Data | keyof Computed | keyof Methods
-
-      new (...args: any[]): ComponentPublicInstance<
-        Readonly<
-          ExtractPropTypes<
-            ExtractMixinProps<Mixin> &
-              ExtractMixinProps<Extends> &
-              (unknown extends TypeProps
-                ? PropsOptions extends (infer Keys extends string)[]
-                  ? { [K in Keys]: null }
-                  : PropsOptions
-                : {})
-          > &
-            TypeProps &
-            EmitsToProps<
-              ExtractMixinEmits<Mixin> &
-                ExtractMixinEmits<Extends> &
-                ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits> &
-                TypeEmitsToOptions<
-                  string[] extends RuntimeEmitsOptions
-                    ? TypeEmits & {}
-                    : ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits> & {}
-                >
-            >
-        >,
-        ExtractMixinSetupBindings<Mixin> &
-          ExtractMixinSetupBindings<Extends> &
-          EnsureNonVoid<SetupBindings>,
-        ExtractMixinData<Mixin> &
-          ExtractMixinData<Extends> &
-          EnsureNonVoid<Data>,
-        ExtractMixinComputed<Mixin> &
-          ExtractMixinComputed<Extends> &
-          Computed & {},
-        ExtractMixinMethods<Mixin> &
-          ExtractMixinMethods<Extends> &
-          Methods & {},
-        ExtractMixinEmits<Mixin> &
-          ExtractMixinEmits<Extends> &
-          ResolveEmitsOptions<RuntimeEmitsOptions & {}, TypeEmits>,
-        PublicProps,
-        MakeDefaultsOptional extends boolean
-          ? Defaults
-          : ExtractDefaultPropTypes<
-              ExtractMixinProps<Mixin> &
-                ExtractMixinProps<Extends> &
-                PropsOptions
-            >,
-        MakeDefaultsOptional extends boolean
-          ? MakeDefaultsOptional
-          : // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-            // user props types verbatim
-            unknown extends TypeProps
-            ? true
-            : false,
+    > &
+      InferComponentOptions<
+        OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+          ? unknown
+          : OptionsOrPropsOrPropOptions,
         {},
-        {}, // InjectOptions
-        Slots & {},
-        Exposed & string,
-        TypeRefs & {},
+        TypeRefs,
         TypeEl,
-        ResolveTypeEmits<RuntimeEmitsOptions & {}, TypeEmits>
+        OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+          ? NormalizePropsOptions<OptionsOrPropsOrPropOptions>
+          : {},
+        string extends EE ? NormalizeEmitsOptions<E> : EE[],
+        D,
+        RawBindings,
+        C,
+        M,
+        Mixin,
+        Extends,
+        S,
+        Exposed,
+        MakeDefaultsOptional,
+        Defaults
       >
-    }
-  : {}
+
+export interface InferComponentOptions<
+  TypeProps,
+  TypeEmits extends ComponentTypeEmits | unknown,
+  TypeRefs extends Record<string, unknown>,
+  TypeEl extends Element,
+  PropsOptions extends ComponentPropsOptions,
+  RuntimeEmitsOptions extends EmitsOptions,
+  Data,
+  SetupBindings,
+  Computed extends ComputedOptions,
+  Methods extends MethodOptions,
+  Mixin extends ComponentOptionsMixin,
+  Extends extends ComponentOptionsMixin,
+  Slots extends SlotsType,
+  Exposed extends string,
+  MakeDefaultsOptional extends boolean,
+  Defaults,
+  // resolved types
+  ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
+    ExtractMixinEmits<Extends> &
+    ResolveEmitsOptions<RuntimeEmitsOptions, TypeEmits>,
+  ResolvedTypeEmits = ResolveTypeEmits<RuntimeEmitsOptions, TypeEmits>,
+  InferredProps = Readonly<
+    ExtractPropTypes<
+      ExtractMixinProps<Mixin> &
+        ExtractMixinProps<Extends> &
+        (unknown extends TypeProps
+          ? PropsOptions extends (infer Keys extends string)[]
+            ? { [K in Keys]: null }
+            : PropsOptions
+          : {})
+    > &
+      TypeProps &
+      EmitsToProps<
+        ResolvedEmits &
+          TypeEmitsToOptions<
+            string[] extends RuntimeEmitsOptions
+              ? TypeEmits & {}
+              : ResolvedTypeEmits & {}
+          >
+      >
+  >,
+> {
+  /**
+   * #3468
+   *
+   * type-only, used to assist Mixin's type inference,
+   * typescript will try to simplify the inferred `Mixin` type,
+   * with the `__differentiator`, typescript won't be able to combine different mixins,
+   * because the `__differentiator` will be different
+   */
+  __differentiator?: keyof Data | keyof Computed | keyof Methods
+
+  new (...args: any[]): ComponentPublicInstance<
+    Readonly<InferredProps>,
+    ExtractMixinSetupBindings<Mixin> &
+      ExtractMixinSetupBindings<Extends> &
+      EnsureNonVoid<SetupBindings>,
+    ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<Data>,
+    ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
+    ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
+    ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends> & ResolvedEmits,
+    PublicProps,
+    Defaults,
+    MakeDefaultsOptional,
+    {},
+    {}, // InjectOptions
+    Slots,
+    Exposed,
+    TypeRefs,
+    TypeEl,
+    ResolvedTypeEmits
+  >
+}
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index d87082759c7..be9b5ed0a25 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -271,6 +271,7 @@ export type {
   DefineComponent,
   DefineSetupFnComponent,
   PublicProps,
+  InferComponentOptions,
 } from './apiDefineComponent'
 export type {
   ComponentOptions,

From 79fba42ecb8f5eee1ebb036071d1cfdbc1982c40 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 19:33:45 +0800
Subject: [PATCH 097/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 980b4c8a80c..55e51e91867 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -92,12 +92,28 @@ export type DefineComponent<
   __typeRefs?: infer TypeRefs
   __typeEl?: infer TypeEl extends Element
 }
-  ? OptionsOrPropsOrPropOptions & {
+  ? Omit<OptionsOrPropsOrPropOptions, 'data' | 'seteup'> & {
       components?: GlobalComponents
       directives?: GlobalDirectives
-    } & Omit<
-        ComponentOptionsBase<any, any, any, any, any, any, any, any>,
-        keyof OptionsOrPropsOrPropOptions
+    } & ComponentOptionsBase<
+        {},
+        SetupBindings,
+        Data,
+        {},
+        {},
+        {},
+        {},
+        {},
+        string,
+        {},
+        {},
+        string,
+        {},
+        {},
+        {},
+        string,
+        {},
+        any
       > &
       InferComponentOptions<
         TypeProps,

From 831cfe946eb0d8fafd16139e40552dadf32d4ac2 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 19:36:33 +0800
Subject: [PATCH 098/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 55e51e91867..27ad18f716a 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -237,7 +237,7 @@ export interface InferComponentOptions<
   __differentiator?: keyof Data | keyof Computed | keyof Methods
 
   new (...args: any[]): ComponentPublicInstance<
-    Readonly<InferredProps>,
+    InferredProps,
     ExtractMixinSetupBindings<Mixin> &
       ExtractMixinSetupBindings<Extends> &
       EnsureNonVoid<SetupBindings>,

From 8effafcf54260bb42070be0511065124e0755c33 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 19:48:44 +0800
Subject: [PATCH 099/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 27ad18f716a..a8075efd1a7 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -92,7 +92,7 @@ export type DefineComponent<
   __typeRefs?: infer TypeRefs
   __typeEl?: infer TypeEl extends Element
 }
-  ? Omit<OptionsOrPropsOrPropOptions, 'data' | 'seteup'> & {
+  ? Omit<OptionsOrPropsOrPropOptions, 'data' | 'setup'> & {
       components?: GlobalComponents
       directives?: GlobalDirectives
     } & ComponentOptionsBase<

From beb7202369ca8317eba137ee40210d0bb6bb126c Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 20:22:58 +0800
Subject: [PATCH 100/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index a8075efd1a7..74d0c211380 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -122,7 +122,7 @@ export type DefineComponent<
         TypeEl,
         PropsOptions & {},
         RuntimeEmitsOptions & {},
-        Data,
+        Data & {},
         SetupBindings,
         Computed & {},
         Methods & {},
@@ -171,7 +171,7 @@ export type DefineComponent<
           ? NormalizePropsOptions<OptionsOrPropsOrPropOptions>
           : {},
         string extends EE ? NormalizeEmitsOptions<E> : EE[],
-        D,
+        D & {},
         RawBindings,
         C,
         M,
@@ -190,7 +190,7 @@ export interface InferComponentOptions<
   TypeEl extends Element,
   PropsOptions extends ComponentPropsOptions,
   RuntimeEmitsOptions extends EmitsOptions,
-  Data,
+  Data extends {},
   SetupBindings,
   Computed extends ComputedOptions,
   Methods extends MethodOptions,

From 179dbe3376213ff2df8e7b578f767d34166edfb7 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 20:49:03 +0800
Subject: [PATCH 101/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 74d0c211380..37721a21624 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -76,7 +76,7 @@ export type DefineComponent<
   MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = OptionsOrPropsOrPropOptions extends {
+> = {} /* use `{} &` to avoid serialization */ & (OptionsOrPropsOrPropOptions extends {
   props?: infer PropsOptions
   emits?: infer RuntimeEmitsOptions
   slots?: infer Slots
@@ -92,7 +92,7 @@ export type DefineComponent<
   __typeRefs?: infer TypeRefs
   __typeEl?: infer TypeEl extends Element
 }
-  ? Omit<OptionsOrPropsOrPropOptions, 'data' | 'setup'> & {
+  ? OptionsOrPropsOrPropOptions & {
       components?: GlobalComponents
       directives?: GlobalDirectives
     } & ComponentOptionsBase<
@@ -181,7 +181,7 @@ export type DefineComponent<
         Exposed,
         MakeDefaultsOptional,
         Defaults
-      >
+      >)
 
 export interface InferComponentOptions<
   TypeProps,
@@ -473,8 +473,8 @@ export function defineComponent<
     inject?: InjectOptions
     mixins?: Mixin[]
     extends?: Extends
-    setup?(): SetupBindings
-    data?(): Data
+    setup?(props: any, ctx: any): SetupBindings
+    data?(vm: any): Data
     __typeProps?: TypeProps
     __typeEmits?: TypeEmits
     __typeRefs?: TypeRefs

From 20c36b905d21fd77f5d756517c89ef6097cca773 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0800
Subject: [PATCH 102/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 223 ++++++------------
 packages/runtime-core/src/index.ts            |   2 +-
 2 files changed, 75 insertions(+), 150 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 37721a21624..b3a325ae200 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -56,18 +56,18 @@ type NormalizePropsOptions<T> = ComponentPropsOptions extends T ? {} : T
 type NormalizeEmitsOptions<T> = EmitsOptions extends T ? {} : T
 
 export type DefineComponent<
-  OptionsOrPropsOrPropOptions = {},
+  PropsOrPropOptions = [{}, unknown],
   RawBindings = {},
   D = {},
   C extends ComputedOptions = ComputedOptions,
   M extends MethodOptions = MethodOptions,
   Mixin extends ComponentOptionsMixin = {},
   Extends extends ComponentOptionsMixin = {},
-  E extends EmitsOptions = {},
+  E extends EmitsOptions | [EmitsOptions, any] = [{}, unknown],
   EE extends string = string,
   PP = never,
   Props = never,
-  Defaults = ExtractDefaultPropTypes<OptionsOrPropsOrPropOptions>,
+  Defaults = never,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
@@ -76,114 +76,52 @@ export type DefineComponent<
   MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = {} /* use `{} &` to avoid serialization */ & (OptionsOrPropsOrPropOptions extends {
-  props?: infer PropsOptions
-  emits?: infer RuntimeEmitsOptions
-  slots?: infer Slots
-  expose?: (infer Exposed)[]
-  computed?: infer Computed
-  methods?: infer Methods
-  mixins?: (infer Mixin)[]
-  extends?: infer Extends
-  setup?(props: any, ctx: any): infer SetupBindings
-  data?(vm: any): infer Data
-  __typeProps?: infer TypeProps
-  __typeEmits?: infer TypeEmits
-  __typeRefs?: infer TypeRefs
-  __typeEl?: infer TypeEl extends Element
-}
-  ? OptionsOrPropsOrPropOptions & {
-      components?: GlobalComponents
-      directives?: GlobalDirectives
-    } & ComponentOptionsBase<
-        {},
-        SetupBindings,
-        Data,
-        {},
-        {},
-        {},
-        {},
-        {},
-        string,
-        {},
-        {},
-        string,
-        {},
-        {},
-        {},
-        string,
-        {},
-        any
-      > &
-      InferComponentOptions<
-        TypeProps,
-        TypeEmits,
-        TypeRefs & {},
-        TypeEl,
-        PropsOptions & {},
-        RuntimeEmitsOptions & {},
-        Data & {},
-        SetupBindings,
-        Computed & {},
-        Methods & {},
-        Mixin & {},
-        Extends & {},
-        Slots & {},
-        Exposed & string,
-        // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-        // user props types verbatim
-        unknown extends TypeProps ? true : false,
-        ExtractDefaultPropTypes<
-          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
-        >
-      >
-  : {
-      props?: OptionsOrPropsOrPropOptions extends ComponentPropsOptions
+> = ComponentOptionsBase<
+  any,
+  RawBindings,
+  D,
+  C,
+  M,
+  Mixin,
+  Extends,
+  E,
+  never,
+  never,
+  {},
+  never,
+  S,
+  LC & GlobalComponents,
+  Directives & GlobalDirectives,
+  Exposed,
+  Provide
+> &
+  InferDefineComponentoptions<
+    PropsOrPropOptions extends any[]
+      ? PropsOrPropOptions[1]
+      : PropsOrPropOptions extends ComponentPropsOptions
         ? unknown
-        : OptionsOrPropsOrPropOptions
-    } & ComponentOptionsBase<
-      any,
-      RawBindings,
-      D,
-      C,
-      M,
-      Mixin,
-      Extends,
-      E,
-      never,
-      never,
-      {},
-      never,
-      S,
-      LC & GlobalComponents,
-      Directives & GlobalDirectives,
-      Exposed,
-      Provide
-    > &
-      InferComponentOptions<
-        OptionsOrPropsOrPropOptions extends ComponentPropsOptions
-          ? unknown
-          : OptionsOrPropsOrPropOptions,
-        {},
-        TypeRefs,
-        TypeEl,
-        OptionsOrPropsOrPropOptions extends ComponentPropsOptions
-          ? NormalizePropsOptions<OptionsOrPropsOrPropOptions>
-          : {},
-        string extends EE ? NormalizeEmitsOptions<E> : EE[],
-        D & {},
-        RawBindings,
-        C,
-        M,
-        Mixin,
-        Extends,
-        S,
-        Exposed,
-        MakeDefaultsOptional,
-        Defaults
-      >)
+        : PropsOrPropOptions,
+    E extends any[] ? E[1] : unknown,
+    TypeRefs,
+    TypeEl,
+    PropsOrPropOptions extends any[]
+      ? PropsOrPropOptions[0]
+      : PropsOrPropOptions extends ComponentPropsOptions
+        ? PropsOrPropOptions
+        : {},
+    E extends any[] ? E[0] : E,
+    D & {},
+    RawBindings,
+    C,
+    M,
+    Mixin,
+    Extends,
+    S,
+    Exposed,
+    MakeDefaultsOptional
+  >
 
-export interface InferComponentOptions<
+export interface InferDefineComponentoptions<
   TypeProps,
   TypeEmits extends ComponentTypeEmits | unknown,
   TypeRefs extends Record<string, unknown>,
@@ -199,8 +137,10 @@ export interface InferComponentOptions<
   Slots extends SlotsType,
   Exposed extends string,
   MakeDefaultsOptional extends boolean,
-  Defaults,
   // resolved types
+  Defaults = ExtractDefaultPropTypes<
+    ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
+  >,
   ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
     ResolveEmitsOptions<RuntimeEmitsOptions, TypeEmits>,
@@ -226,6 +166,8 @@ export interface InferComponentOptions<
       >
   >,
 > {
+  props?: PropsOptions
+
   /**
    * #3468
    *
@@ -460,45 +402,28 @@ export function defineComponent<
       }
     >,
 ): DefineComponent<
-  {
-    props?: NormalizedProps
-    emits?: string[] extends NormalizedEmits ? {} : NormalizedEmits
-    components?: LocalComponents
-    directives?: Directives
-    slots?: Slots
-    expose?: Exposed[]
-    computed?: Computed
-    methods?: Methods
-    provide?: Provide
-    inject?: InjectOptions
-    mixins?: Mixin[]
-    extends?: Extends
-    setup?(props: any, ctx: any): SetupBindings
-    data?(vm: any): Data
-    __typeProps?: TypeProps
-    __typeEmits?: TypeEmits
-    __typeRefs?: TypeRefs
-    __typeEl?: TypeEl
-  },
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any
+  [NormalizedProps, TypeProps],
+  SetupBindings,
+  Data,
+  Computed,
+  Methods,
+  Mixin,
+  Extends,
+  [string[] extends NormalizedEmits ? {} : NormalizedEmits, TypeEmits],
+  string,
+  never,
+  never,
+  never,
+  Slots,
+  LocalComponents,
+  Directives,
+  Exposed,
+  Provide,
+  // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+  // user props types verbatim
+  unknown extends TypeProps ? true : false,
+  TypeRefs,
+  TypeEl
 >
 
 // implementation, close to no-op
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index be9b5ed0a25..63450695ee8 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -271,7 +271,7 @@ export type {
   DefineComponent,
   DefineSetupFnComponent,
   PublicProps,
-  InferComponentOptions,
+  InferDefineComponentoptions,
 } from './apiDefineComponent'
 export type {
   ComponentOptions,

From c27158b97f3dac4f696c2303c45a6ef0ab45e3f8 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Tue, 25 Feb 2025 22:38:25 +0800
Subject: [PATCH 103/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index b3a325ae200..c41c9341ba1 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -84,7 +84,7 @@ export type DefineComponent<
   M,
   Mixin,
   Extends,
-  E,
+  E extends any[] ? E[0] : E,
   never,
   never,
   {},

From 27278a0ecde1fd7c15c3bb0dff7e44a07a5de95d Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 12:24:11 +0800
Subject: [PATCH 104/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index c41c9341ba1..ef01819d6b5 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -64,7 +64,7 @@ export type DefineComponent<
   Mixin extends ComponentOptionsMixin = {},
   Extends extends ComponentOptionsMixin = {},
   E extends EmitsOptions | [EmitsOptions, any] = [{}, unknown],
-  EE extends string = string,
+  EE = never,
   PP = never,
   Props = never,
   Defaults = never,

From 883fda573f0daccbbf0d0d549c26f841e39c69d3 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 12:39:42 +0800
Subject: [PATCH 105/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 4 ++--
 packages/runtime-core/src/index.ts              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ef01819d6b5..85e106c4bd8 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -95,7 +95,7 @@ export type DefineComponent<
   Exposed,
   Provide
 > &
-  InferDefineComponentoptions<
+  InferDefineComponentOptions<
     PropsOrPropOptions extends any[]
       ? PropsOrPropOptions[1]
       : PropsOrPropOptions extends ComponentPropsOptions
@@ -121,7 +121,7 @@ export type DefineComponent<
     MakeDefaultsOptional
   >
 
-export interface InferDefineComponentoptions<
+export interface InferDefineComponentOptions<
   TypeProps,
   TypeEmits extends ComponentTypeEmits | unknown,
   TypeRefs extends Record<string, unknown>,
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 63450695ee8..47d53651378 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -271,7 +271,7 @@ export type {
   DefineComponent,
   DefineSetupFnComponent,
   PublicProps,
-  InferDefineComponentoptions,
+  InferDefineComponentOptions,
 } from './apiDefineComponent'
 export type {
   ComponentOptions,

From fad26f64b1347aefa8b4424831a1ed17b830558e Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 12:46:28 +0800
Subject: [PATCH 106/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 85e106c4bd8..ef78600cc15 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -67,7 +67,9 @@ export type DefineComponent<
   EE = never,
   PP = never,
   Props = never,
-  Defaults = never,
+  Defaults = PropsOrPropOptions extends any[]
+    ? never
+    : ExtractDefaultPropTypes<PropsOrPropOptions>,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
@@ -118,7 +120,14 @@ export type DefineComponent<
     Extends,
     S,
     Exposed,
-    MakeDefaultsOptional
+    MakeDefaultsOptional,
+    PropsOrPropOptions extends any[]
+      ? ExtractDefaultPropTypes<
+          ExtractMixinProps<Mixin> &
+            ExtractMixinProps<Extends> &
+            PropsOrPropOptions[0]
+        >
+      : Defaults
   >
 
 export interface InferDefineComponentOptions<
@@ -137,10 +146,8 @@ export interface InferDefineComponentOptions<
   Slots extends SlotsType,
   Exposed extends string,
   MakeDefaultsOptional extends boolean,
+  Defaults,
   // resolved types
-  Defaults = ExtractDefaultPropTypes<
-    ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & PropsOptions
-  >,
   ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
     ResolveEmitsOptions<RuntimeEmitsOptions, TypeEmits>,

From 8af8d117517c6ae8095aad8505b6299079f4b9be Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 14:12:11 +0800
Subject: [PATCH 107/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ef78600cc15..9297cbc484b 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -86,7 +86,7 @@ export type DefineComponent<
   M,
   Mixin,
   Extends,
-  E extends any[] ? E[0] : E,
+  E extends any[] ? E[0] : NormalizeEmitsOptions<E>,
   never,
   never,
   {},
@@ -111,7 +111,7 @@ export type DefineComponent<
       : PropsOrPropOptions extends ComponentPropsOptions
         ? PropsOrPropOptions
         : {},
-    E extends any[] ? E[0] : E,
+    E extends any[] ? E[0] : NormalizeEmitsOptions<E>,
     D & {},
     RawBindings,
     C,

From a29b1a09b2d8bb840d12762cde21fe7abe0ac060 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 15:25:27 +0800
Subject: [PATCH 108/127] wip

---
 packages/runtime-core/src/componentEmits.ts   | 30 ++++++++++---------
 .../src/componentPublicInstance.ts            |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
index 4344e3c0ddf..805b804cc50 100644
--- a/packages/runtime-core/src/componentEmits.ts
+++ b/packages/runtime-core/src/componentEmits.ts
@@ -1,5 +1,6 @@
 import {
   EMPTY_OBJ,
+  type IfAny,
   type OverloadParameters,
   type UnionToIntersection,
   camelize,
@@ -93,20 +94,21 @@ export type ShortEmitsToObject<E> =
 export type EmitFn<
   Options = ObjectEmitsOptions,
   Event extends keyof Options = keyof Options,
-> =
-  Options extends Array<infer V>
-    ? (event: V, ...args: any[]) => void
-    : string[] extends Event
-      ? {}
-      : UnionToIntersection<
-          {
-            [key in Event]: Options[key] extends (...args: infer Args) => any
-              ? (event: key, ...args: Args) => void
-              : Options[key] extends any[]
-                ? (event: key, ...args: Options[key]) => void
-                : (event: key, ...args: any[]) => void
-          }[Event]
-        >
+> = Options extends (infer V)[]
+  ? (event: V, ...args: any[]) => void
+  : IfAny<
+      Event,
+      {},
+      UnionToIntersection<
+        {
+          [key in Event]: Options[key] extends (...args: infer Args) => any
+            ? (event: key, ...args: Args) => void
+            : Options[key] extends any[]
+              ? (event: key, ...args: Options[key]) => void
+              : (event: key, ...args: any[]) => void
+        }[Event]
+      >
+    >
 
 export function emit(
   instance: ComponentInternalInstance,
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 6a8378f09f8..e30016d887f 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -304,7 +304,7 @@ export type ComponentPublicInstance<
   $root: ComponentPublicInstance | null
   $parent: ComponentPublicInstance | null
   $host: Element | null
-  $emit: EmitFn<E> & TypeEmits
+  $emit: EmitFn<E extends never[] ? {} : E> & TypeEmits
   $el: TypeEl
   $options: Options & MergedComponentOptionsOverride
   $forceUpdate: () => void

From d4acf829ca1a8a40479aa53d8aaf3406e9baaa47 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 16:27:42 +0800
Subject: [PATCH 109/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    |  4 +--
 packages/runtime-core/src/component.ts        |  8 ++---
 packages/runtime-core/src/componentEmits.ts   | 34 +++++++++++--------
 packages/runtime-core/src/componentOptions.ts |  2 +-
 .../src/componentPublicInstance.ts            |  6 ++--
 packages/runtime-core/src/h.ts                |  2 +-
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 9297cbc484b..e4c4181f49f 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -209,7 +209,7 @@ export interface InferDefineComponentOptions<
 
 export type DefineSetupFnComponent<
   P extends Record<string, any>,
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   S extends SlotsType = SlotsType,
   Props = P & EmitsToProps<E>,
   PP = PublicProps,
@@ -416,7 +416,7 @@ export function defineComponent<
   Methods,
   Mixin,
   Extends,
-  [string[] extends NormalizedEmits ? {} : NormalizedEmits, TypeEmits],
+  [NormalizedEmits, TypeEmits],
   string,
   never,
   never,
diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index ba19b1e9991..e417db9a2d0 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -112,8 +112,8 @@ export type Data = Record<string, unknown>
  */
 export type ComponentInstance<T> = T extends { new (): ComponentPublicInstance }
   ? InstanceType<T>
-  : T extends FunctionalComponent<infer Props, infer Emits>
-    ? ComponentPublicInstance<Props, {}, {}, {}, {}, ShortEmitsToObject<Emits>>
+  : T extends FunctionalComponent<infer Props, any, any, infer Emits>
+    ? ComponentPublicInstance<Props, {}, {}, {}, {}, Emits>
     : T extends Component<
           infer Props,
           infer RawBindings,
@@ -284,13 +284,13 @@ export type LifecycleHook<TFn = Function> = (TFn & SchedulerJob)[] | null
 
 // use `E extends any` to force evaluating type to fix #2362
 export type SetupContext<
-  E = EmitsOptions,
+  E extends EmitsOptions | Record<string, any[]> = EmitsOptions,
   S extends SlotsType = {},
 > = E extends any
   ? {
       attrs: Data
       slots: UnwrapSlotsType<S>
-      emit: EmitFn<E>
+      emit: EmitFn<ShortEmitsToObject<E>>
       expose: <Exposed extends Record<string, any> = Record<string, any>>(
         exposed?: Exposed,
       ) => void
diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts
index 805b804cc50..c19864a06cd 100644
--- a/packages/runtime-core/src/componentEmits.ts
+++ b/packages/runtime-core/src/componentEmits.ts
@@ -92,23 +92,27 @@ export type ShortEmitsToObject<E> =
     : E
 
 export type EmitFn<
-  Options = ObjectEmitsOptions,
+  Options extends EmitsOptions = ObjectEmitsOptions,
   Event extends keyof Options = keyof Options,
-> = Options extends (infer V)[]
-  ? (event: V, ...args: any[]) => void
-  : IfAny<
-      Event,
-      {},
-      UnionToIntersection<
-        {
-          [key in Event]: Options[key] extends (...args: infer Args) => any
-            ? (event: key, ...args: Args) => void
-            : Options[key] extends any[]
-              ? (event: key, ...args: Options[key]) => void
-              : (event: key, ...args: any[]) => void
-        }[Event]
+> = EmitsOptions extends Options
+  ? keyof Options extends never
+    ? {}
+    : (event: string, ...args: any[]) => void
+  : Options extends (infer V)[]
+    ? (event: V, ...args: any[]) => void
+    : IfAny<
+        Event,
+        {},
+        UnionToIntersection<
+          {
+            [key in Event]: Options[key] extends (...args: infer Args) => any
+              ? (event: key, ...args: Args) => void
+              : Options[key] extends any[]
+                ? (event: key, ...args: Options[key]) => void
+                : (event: key, ...args: any[]) => void
+          }[Event]
+        >
       >
-    >
 
 export function emit(
   instance: ComponentInternalInstance,
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 7062cf15619..7ee8ee52e91 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -1058,7 +1058,7 @@ export type ComponentOptionsWithoutProps<
   M extends MethodOptions = {},
   Mixin extends ComponentOptionsMixin = {},
   Extends extends ComponentOptionsMixin = {},
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   EE extends string = string,
   I extends ComponentInjectOptions = {},
   II extends string = string,
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index e30016d887f..fe555eed988 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -135,7 +135,7 @@ export type CreateComponentPublicInstance<
   M extends MethodOptions = {},
   Mixin extends ComponentOptionsMixin = {},
   Extends extends ComponentOptionsMixin = {},
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   PublicProps = P,
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
@@ -202,7 +202,7 @@ export type CreateComponentPublicInstanceWithMixins<
   M extends MethodOptions = {},
   Mixin extends ComponentOptionsMixin = {},
   Extends extends ComponentOptionsMixin = {},
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   PublicProps = P,
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
@@ -281,7 +281,7 @@ export type ComponentPublicInstance<
   D = {}, // return from data()
   C extends ComputedOptions = {},
   M extends MethodOptions = {},
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   PublicProps = {},
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
diff --git a/packages/runtime-core/src/h.ts b/packages/runtime-core/src/h.ts
index e2da149429f..0f61eeb344f 100644
--- a/packages/runtime-core/src/h.ts
+++ b/packages/runtime-core/src/h.ts
@@ -137,7 +137,7 @@ export function h(
 // functional component
 export function h<
   P,
-  E extends EmitsOptions = {},
+  E extends EmitsOptions = string[],
   S extends Record<string, any> = any,
 >(
   type: FunctionalComponent<P, any, S, any>,

From 1424ebef2322045c9a31b067f2933aefc030ad24 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 17:18:20 +0800
Subject: [PATCH 110/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 10 +++++++++-
 packages/runtime-core/src/componentOptions.ts   | 16 ++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index e4c4181f49f..04d93326679 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -401,7 +401,15 @@ export function defineComponent<
     Record<string, Directive> | Directives,
     Exposed,
     Provide,
-    InternalInstance
+    CreateComponentPublicInstanceWithMixins<
+      InferredProps,
+      SetupBindings,
+      {},
+      {},
+      MethodOptions,
+      Mixin,
+      Extends
+    >
   > &
     ThisType<
       NoInfer<InternalInstance> & {
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 7ee8ee52e91..4830d1990bf 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -123,16 +123,8 @@ export interface ComponentOptionsBase<
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  InternalInstance = CreateComponentPublicInstanceWithMixins<
-    Props,
-    {},
-    {},
-    {},
-    MethodOptions,
-    Mixin,
-    Extends
-  >,
-> extends LegacyOptions<InternalInstance, D, C, M, Mixin, Extends, I, Provide>,
+  DataVM = any,
+> extends LegacyOptions<DataVM, D, C, M, Mixin, Extends, I, Provide>,
     ComponentInternalOptions,
     ComponentCustomOptions {
   setup?: (
@@ -336,7 +328,7 @@ export type InjectToObject<T extends ComponentInjectOptions> =
       : never
 
 interface LegacyOptions<
-  InternalInstance,
+  DataVM,
   D,
   C extends ComputedOptions,
   M extends MethodOptions,
@@ -350,7 +342,7 @@ interface LegacyOptions<
   // allow any custom options
   [key: string]: any
 
-  data?: (vm: NoInfer<InternalInstance>) => D
+  data?: (this: DataVM, vm: DataVM) => D
   computed?: C
   methods?: M
   watch?: ComponentWatchOptions

From 54c20e51e1ac1bb67ef901d8a13d9faffc22b4eb Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 17:20:52 +0800
Subject: [PATCH 111/127] wip

---
 .../runtime-core/src/apiDefineComponent.ts    | 51 ++++++++++---------
 .../src/componentPublicInstance.ts            |  4 +-
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 04d93326679..ab3ed0e04b6 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -127,7 +127,8 @@ export type DefineComponent<
             ExtractMixinProps<Extends> &
             PropsOrPropOptions[0]
         >
-      : Defaults
+      : Defaults,
+    PropsOrPropOptions extends any[] ? true : false
   >
 
 export interface InferDefineComponentOptions<
@@ -147,6 +148,7 @@ export interface InferDefineComponentOptions<
   Exposed extends string,
   MakeDefaultsOptional extends boolean,
   Defaults,
+  StrictEmits extends boolean,
   // resolved types
   ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
@@ -203,7 +205,8 @@ export interface InferDefineComponentOptions<
     Exposed,
     TypeRefs,
     TypeEl,
-    ResolvedTypeEmits
+    ResolvedTypeEmits,
+    StrictEmits
   >
 }
 
@@ -344,26 +347,6 @@ export function defineComponent<
           >
       >
   >,
-  InternalInstance = ComponentPublicInstance<
-    InferredProps,
-    ExtractMixinSetupBindings<Mixin> &
-      ExtractMixinSetupBindings<Extends> &
-      SetupBindings,
-    ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<Data>,
-    ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
-    ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
-    ResolvedEmits,
-    {}, // PublicProps
-    {}, // Defaults
-    false,
-    {},
-    InjectOptions,
-    Slots,
-    Exposed,
-    TypeRefs,
-    TypeEl,
-    ResolvedTypeEmits
-  >,
 >(
   options: {
     props?: ComponentObjectPropsOptions | RawPropsOptions | _PropsKeys[]
@@ -412,7 +395,29 @@ export function defineComponent<
     >
   > &
     ThisType<
-      NoInfer<InternalInstance> & {
+      ComponentPublicInstance<
+        InferredProps,
+        ExtractMixinSetupBindings<Mixin> &
+          ExtractMixinSetupBindings<Extends> &
+          SetupBindings,
+        ExtractMixinData<Mixin> &
+          ExtractMixinData<Extends> &
+          EnsureNonVoid<Data>,
+        ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
+        ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
+        ResolvedEmits,
+        {}, // PublicProps
+        {}, // Defaults
+        false,
+        {},
+        InjectOptions,
+        Slots,
+        Exposed,
+        TypeRefs,
+        TypeEl,
+        ResolvedTypeEmits,
+        true
+      > & {
         $options: typeof options
       }
     >,
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index fe555eed988..d869d8f56c8 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -292,6 +292,7 @@ export type ComponentPublicInstance<
   TypeRefs extends Data = {},
   TypeEl extends Element = any,
   TypeEmits = {},
+  StrictEmits extends boolean = false,
 > = {
   $: ComponentInternalInstance
   $data: D
@@ -304,7 +305,8 @@ export type ComponentPublicInstance<
   $root: ComponentPublicInstance | null
   $parent: ComponentPublicInstance | null
   $host: Element | null
-  $emit: EmitFn<E extends never[] ? {} : E> & TypeEmits
+  $emit: EmitFn<StrictEmits extends true ? E : {} extends E ? string[] : E> &
+    TypeEmits
   $el: TypeEl
   $options: Options & MergedComponentOptionsOverride
   $forceUpdate: () => void

From c28cf9074e0df3313ce3a2f621d5ad4521418edb Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 17:50:36 +0800
Subject: [PATCH 112/127] wip

---
 packages/runtime-core/src/apiDefineComponent.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ab3ed0e04b6..c78f3981645 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -384,14 +384,14 @@ export function defineComponent<
     Record<string, Directive> | Directives,
     Exposed,
     Provide,
-    CreateComponentPublicInstanceWithMixins<
+    ComponentPublicInstance<
       InferredProps,
-      SetupBindings,
-      {},
-      {},
-      MethodOptions,
-      Mixin,
-      Extends
+      ExtractMixinSetupBindings<Mixin> &
+        ExtractMixinSetupBindings<Extends> &
+        SetupBindings,
+      ExtractMixinData<Mixin> & ExtractMixinData<Extends>,
+      ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & {},
+      ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & MethodOptions
     >
   > &
     ThisType<

From 4fa7ac176316545b1e2346bceda92c355452072b Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Wed, 26 Feb 2025 20:28:43 +0800
Subject: [PATCH 113/127] structured options

---
 .../runtime-core/src/apiDefineComponent.ts    | 249 ++++++++++--------
 packages/runtime-core/src/index.ts            |   2 +-
 2 files changed, 133 insertions(+), 118 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index c78f3981645..4df3bf9c93b 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -4,6 +4,7 @@ import type {
   AllowedComponentProps,
   Component,
   ComponentCustomProps,
+  Data,
   GlobalComponents,
   GlobalDirectives,
   SetupContext,
@@ -55,21 +56,40 @@ type NormalizePropsOptions<T> = ComponentPropsOptions extends T ? {} : T
 
 type NormalizeEmitsOptions<T> = EmitsOptions extends T ? {} : T
 
+export interface ComponentOptionsSchema {
+  setup(): unknown
+  data(): unknown
+  props: ComponentPropsOptions
+  computed: ComputedOptions
+  methods: MethodOptions
+  mixins: unknown[]
+  extends: unknown
+  emits: EmitsOptions
+  slots: SlotsType
+  components: Record<string, Component>
+  directives: Record<string, Directive>
+  provide: ComponentProvideOptions
+  expose: string
+  __defaults: unknown
+  __typeProps: unknown
+  __typeEmits: unknown
+  __typeRefs: Data
+  __typeEl: Element
+}
+
 export type DefineComponent<
-  PropsOrPropOptions = [{}, unknown],
+  PropsOrPropOptions = {},
   RawBindings = {},
   D = {},
   C extends ComputedOptions = ComputedOptions,
   M extends MethodOptions = MethodOptions,
   Mixin extends ComponentOptionsMixin = {},
   Extends extends ComponentOptionsMixin = {},
-  E extends EmitsOptions | [EmitsOptions, any] = [{}, unknown],
+  E extends EmitsOptions = {},
   EE = never,
   PP = never,
   Props = never,
-  Defaults = PropsOrPropOptions extends any[]
-    ? never
-    : ExtractDefaultPropTypes<PropsOrPropOptions>,
+  Defaults = ExtractDefaultPropTypes<PropsOrPropOptions>,
   S extends SlotsType = {},
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
@@ -78,104 +98,94 @@ export type DefineComponent<
   MakeDefaultsOptional extends boolean = true,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-> = ComponentOptionsBase<
-  any,
-  RawBindings,
-  D,
-  C,
-  M,
-  Mixin,
-  Extends,
-  E extends any[] ? E[0] : NormalizeEmitsOptions<E>,
-  never,
-  never,
-  {},
-  never,
-  S,
-  LC & GlobalComponents,
-  Directives & GlobalDirectives,
-  Exposed,
-  Provide
-> &
-  InferDefineComponentOptions<
-    PropsOrPropOptions extends any[]
-      ? PropsOrPropOptions[1]
-      : PropsOrPropOptions extends ComponentPropsOptions
-        ? unknown
-        : PropsOrPropOptions,
-    E extends any[] ? E[1] : unknown,
-    TypeRefs,
-    TypeEl,
-    PropsOrPropOptions extends any[]
-      ? PropsOrPropOptions[0]
-      : PropsOrPropOptions extends ComponentPropsOptions
-        ? PropsOrPropOptions
-        : {},
-    E extends any[] ? E[0] : NormalizeEmitsOptions<E>,
-    D & {},
-    RawBindings,
-    C,
-    M,
-    Mixin,
-    Extends,
-    S,
-    Exposed,
-    MakeDefaultsOptional,
-    PropsOrPropOptions extends any[]
-      ? ExtractDefaultPropTypes<
-          ExtractMixinProps<Mixin> &
-            ExtractMixinProps<Extends> &
-            PropsOrPropOptions[0]
-        >
-      : Defaults,
-    PropsOrPropOptions extends any[] ? true : false
-  >
+> = InferComponent<
+  {
+    setup(): RawBindings
+    data(): D
+    props: PropsOrPropOptions extends ComponentPropsOptions
+      ? PropsOrPropOptions
+      : {}
+    computed: C
+    methods: M
+    mixins: Mixin[]
+    extends: Extends
+    emits: E
+    slots: S
+    components: LC
+    directives: Directives
+    provide: Provide
+    expose: Exposed
+    __defaults: Defaults
+    __typeProps: PropsOrPropOptions extends ComponentPropsOptions
+      ? unknown
+      : PropsOrPropOptions
+    __typeEmits: unknown
+    __typeRefs: TypeRefs
+    __typeEl: TypeEl
+  },
+  MakeDefaultsOptional,
+  false
+>
 
-export interface InferDefineComponentOptions<
-  TypeProps,
-  TypeEmits extends ComponentTypeEmits | unknown,
-  TypeRefs extends Record<string, unknown>,
-  TypeEl extends Element,
-  PropsOptions extends ComponentPropsOptions,
-  RuntimeEmitsOptions extends EmitsOptions,
-  Data extends {},
-  SetupBindings,
-  Computed extends ComputedOptions,
-  Methods extends MethodOptions,
-  Mixin extends ComponentOptionsMixin,
-  Extends extends ComponentOptionsMixin,
-  Slots extends SlotsType,
-  Exposed extends string,
+export type DefineComponent2<T extends ComponentOptionsSchema> = InferComponent<
+  T,
+  // MakeDefaultsOptional - if TypeProps is provided, set to false to use
+  // user props types verbatim
+  unknown extends T['__typeProps'] ? true : false,
+  true
+>
+
+type InferComponent<
+  T extends ComponentOptionsSchema,
   MakeDefaultsOptional extends boolean,
-  Defaults,
   StrictEmits extends boolean,
   // resolved types
+  Mixin = T['mixins'][number],
+  Extends = T['extends'],
   ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
     ExtractMixinEmits<Extends> &
-    ResolveEmitsOptions<RuntimeEmitsOptions, TypeEmits>,
-  ResolvedTypeEmits = ResolveTypeEmits<RuntimeEmitsOptions, TypeEmits>,
+    ResolveEmitsOptions<T['emits'], T['__typeEmits']>,
+  ResolvedTypeEmits = ResolveTypeEmits<T['emits'], T['__typeEmits']>,
   InferredProps = Readonly<
     ExtractPropTypes<
       ExtractMixinProps<Mixin> &
         ExtractMixinProps<Extends> &
-        (unknown extends TypeProps
-          ? PropsOptions extends (infer Keys extends string)[]
+        (unknown extends T['__typeProps']
+          ? T['props'] extends (infer Keys extends string)[]
             ? { [K in Keys]: null }
-            : PropsOptions
+            : T['props']
           : {})
     > &
-      TypeProps &
+      T['__typeProps'] &
       EmitsToProps<
         ResolvedEmits &
           TypeEmitsToOptions<
-            string[] extends RuntimeEmitsOptions
-              ? TypeEmits & {}
+            string[] extends T['emits']
+              ? T['__typeEmits'] & {}
               : ResolvedTypeEmits & {}
           >
       >
   >,
-> {
-  props?: PropsOptions
+> = ComponentOptionsBase<
+  any,
+  ReturnType<T['setup']>,
+  ReturnType<T['data']>,
+  T['computed'],
+  T['methods'],
+  T['mixins'][number] & {},
+  T['extends'] & {},
+  T['emits'],
+  never,
+  never,
+  {},
+  never,
+  T['slots'],
+  T['components'] & GlobalComponents,
+  T['directives'] & GlobalDirectives,
+  T['expose'],
+  T['provide']
+> & {
+  props?: T['props']
 
   /**
    * #3468
@@ -185,26 +195,35 @@ export interface InferDefineComponentOptions<
    * with the `__differentiator`, typescript won't be able to combine different mixins,
    * because the `__differentiator` will be different
    */
-  __differentiator?: keyof Data | keyof Computed | keyof Methods
+  __differentiator?:
+    | keyof ReturnType<T['data']>
+    | keyof T['computed']
+    | keyof T['methods']
 
   new (...args: any[]): ComponentPublicInstance<
     InferredProps,
     ExtractMixinSetupBindings<Mixin> &
       ExtractMixinSetupBindings<Extends> &
-      EnsureNonVoid<SetupBindings>,
-    ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<Data>,
-    ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
-    ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
+      EnsureNonVoid<ReturnType<T['setup']>>,
+    ExtractMixinData<Mixin> &
+      ExtractMixinData<Extends> &
+      EnsureNonVoid<ReturnType<T['data']>>,
+    ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & T['computed'],
+    ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & T['methods'],
     ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends> & ResolvedEmits,
     PublicProps,
-    Defaults,
+    unknown extends T['__defaults']
+      ? ExtractDefaultPropTypes<
+          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & T['props']
+        >
+      : T['__defaults'],
     MakeDefaultsOptional,
     {},
     {}, // InjectOptions
-    Slots,
-    Exposed,
-    TypeRefs,
-    TypeEl,
+    T['slots'],
+    T['expose'],
+    T['__typeRefs'],
+    T['__typeEl'],
     ResolvedTypeEmits,
     StrictEmits
   >
@@ -421,30 +440,26 @@ export function defineComponent<
         $options: typeof options
       }
     >,
-): DefineComponent<
-  [NormalizedProps, TypeProps],
-  SetupBindings,
-  Data,
-  Computed,
-  Methods,
-  Mixin,
-  Extends,
-  [NormalizedEmits, TypeEmits],
-  string,
-  never,
-  never,
-  never,
-  Slots,
-  LocalComponents,
-  Directives,
-  Exposed,
-  Provide,
-  // MakeDefaultsOptional - if TypeProps is provided, set to false to use
-  // user props types verbatim
-  unknown extends TypeProps ? true : false,
-  TypeRefs,
-  TypeEl
->
+): DefineComponent2<{
+  setup(): SetupBindings
+  data(): Data
+  props: NormalizedProps & {}
+  computed: Computed
+  methods: Methods
+  mixins: Mixin[]
+  extends: Extends
+  emits: NormalizedEmits
+  slots: Slots
+  components: LocalComponents
+  directives: Directives
+  provide: Provide
+  expose: Exposed
+  __defaults: unknown
+  __typeProps: TypeProps
+  __typeEmits: TypeEmits
+  __typeRefs: TypeRefs
+  __typeEl: TypeEl
+}>
 
 // implementation, close to no-op
 /*! #__NO_SIDE_EFFECTS__ */
diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 47d53651378..f24ba926a31 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -269,9 +269,9 @@ export type {
 } from './component'
 export type {
   DefineComponent,
+  DefineComponent2,
   DefineSetupFnComponent,
   PublicProps,
-  InferDefineComponentOptions,
 } from './apiDefineComponent'
 export type {
   ComponentOptions,

From e5d0e4c9bf8f2389708af210c039fd384f87f0a9 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 27 Feb 2025 00:42:28 +0800
Subject: [PATCH 114/127] use CreateComponentPublicInstanceWithMixins

---
 .../runtime-core/src/apiDefineComponent.ts    | 139 +++++++++---------
 packages/runtime-core/src/componentOptions.ts |   6 +-
 .../src/componentPublicInstance.ts            |  59 +++++---
 3 files changed, 110 insertions(+), 94 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 4df3bf9c93b..f3ccd8280ab 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -34,15 +34,8 @@ import type {
   ExtractPropTypes,
 } from './componentProps'
 import type {
-  ComponentPublicInstance,
   CreateComponentPublicInstanceWithMixins,
-  EnsureNonVoid,
-  ExtractMixinComputed,
-  ExtractMixinData,
   ExtractMixinEmits,
-  ExtractMixinMethods,
-  ExtractMixinProps,
-  ExtractMixinSetupBindings,
 } from './componentPublicInstance'
 import type { SlotsType } from './componentSlots'
 import type { Directive } from './directives'
@@ -62,10 +55,11 @@ export interface ComponentOptionsSchema {
   props: ComponentPropsOptions
   computed: ComputedOptions
   methods: MethodOptions
-  mixins: unknown[]
-  extends: unknown
+  mixins: ComponentOptionsMixin[]
+  extends: ComponentOptionsMixin
   emits: EmitsOptions
   slots: SlotsType
+  inject: ComponentInjectOptions
   components: Record<string, Component>
   directives: Record<string, Directive>
   provide: ComponentProvideOptions
@@ -111,6 +105,7 @@ export type DefineComponent<
     extends: Extends
     emits: E
     slots: S
+    inject: {}
     components: LC
     directives: Directives
     provide: Provide
@@ -140,25 +135,26 @@ type InferComponent<
   MakeDefaultsOptional extends boolean,
   StrictEmits extends boolean,
   // resolved types
-  Mixin = T['mixins'][number],
-  Extends = T['extends'],
-  ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
-    ExtractMixinEmits<Extends> &
-    ResolveEmitsOptions<T['emits'], T['__typeEmits']>,
+  Mixin extends ComponentOptionsMixin = T['mixins'][number],
+  Extends extends ComponentOptionsMixin = T['extends'],
+  ResolvedEmits extends ObjectEmitsOptions = ResolveEmitsOptions<
+    T['emits'],
+    T['__typeEmits']
+  >,
   ResolvedTypeEmits = ResolveTypeEmits<T['emits'], T['__typeEmits']>,
   InferredProps = Readonly<
     ExtractPropTypes<
-      ExtractMixinProps<Mixin> &
-        ExtractMixinProps<Extends> &
-        (unknown extends T['__typeProps']
-          ? T['props'] extends (infer Keys extends string)[]
-            ? { [K in Keys]: null }
-            : T['props']
-          : {})
+      unknown extends T['__typeProps']
+        ? T['props'] extends (infer Keys extends string)[]
+          ? { [K in Keys]: null }
+          : T['props']
+        : {}
     > &
       T['__typeProps'] &
       EmitsToProps<
-        ResolvedEmits &
+        ExtractMixinEmits<Mixin> &
+          ExtractMixinEmits<Extends> &
+          ResolvedEmits &
           TypeEmitsToOptions<
             string[] extends T['emits']
               ? T['__typeEmits'] & {}
@@ -200,32 +196,33 @@ type InferComponent<
     | keyof T['computed']
     | keyof T['methods']
 
-  new (...args: any[]): ComponentPublicInstance<
+  new (
+    ...args: any[]
+  ): CreateComponentPublicInstanceWithMixins<
     InferredProps,
-    ExtractMixinSetupBindings<Mixin> &
-      ExtractMixinSetupBindings<Extends> &
-      EnsureNonVoid<ReturnType<T['setup']>>,
-    ExtractMixinData<Mixin> &
-      ExtractMixinData<Extends> &
-      EnsureNonVoid<ReturnType<T['data']>>,
-    ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & T['computed'],
-    ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & T['methods'],
-    ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends> & ResolvedEmits,
+    ReturnType<T['setup']>,
+    ReturnType<T['data']>,
+    T['computed'],
+    T['methods'],
+    Mixin,
+    Extends,
+    ResolvedEmits,
     PublicProps,
     unknown extends T['__defaults']
-      ? ExtractDefaultPropTypes<
-          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & T['props']
-        >
+      ? ExtractDefaultPropTypes<T['props']>
       : T['__defaults'],
     MakeDefaultsOptional,
-    {},
-    {}, // InjectOptions
+    T['inject'],
     T['slots'],
+    T['components'] & GlobalComponents,
+    T['directives'] & GlobalDirectives,
     T['expose'],
     T['__typeRefs'],
     T['__typeEl'],
+    T['provide'],
     ResolvedTypeEmits,
-    StrictEmits
+    StrictEmits,
+    any
   >
 }
 
@@ -340,25 +337,27 @@ export function defineComponent<
   _EmitsKeys extends string = string,
   _InjectKeys extends string = string,
   // resolved types
-  NormalizedProps = NormalizePropsOptions<RawPropsOptions>,
+  NormalizedProps extends
+    ComponentPropsOptions = NormalizePropsOptions<RawPropsOptions>,
   NormalizedEmits extends EmitsOptions = NormalizeEmitsOptions<RawEmitsOptions>,
-  ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
-    ExtractMixinEmits<Extends> &
-    ResolveEmitsOptions<NormalizedEmits, TypeEmits>,
+  ResolvedEmits extends ObjectEmitsOptions = ResolveEmitsOptions<
+    NormalizedEmits,
+    TypeEmits
+  >,
   ResolvedTypeEmits = ResolveTypeEmits<NormalizedEmits, TypeEmits>,
   InferredProps = Readonly<
     ExtractPropTypes<
-      ExtractMixinProps<Mixin> &
-        ExtractMixinProps<Extends> &
-        (unknown extends TypeProps
-          ? NormalizedProps extends (infer Keys extends string)[]
-            ? { [K in Keys]: null }
-            : NormalizedProps
-          : {})
+      unknown extends TypeProps
+        ? NormalizedProps extends (infer Keys extends string)[]
+          ? { [K in Keys]: null }
+          : NormalizedProps
+        : {}
     > &
       TypeProps &
       EmitsToProps<
-        ResolvedEmits &
+        ExtractMixinEmits<Mixin> &
+          ExtractMixinEmits<Extends> &
+          ResolvedEmits &
           TypeEmitsToOptions<
             string[] extends NormalizedEmits
               ? TypeEmits & {}
@@ -403,39 +402,40 @@ export function defineComponent<
     Record<string, Directive> | Directives,
     Exposed,
     Provide,
-    ComponentPublicInstance<
+    CreateComponentPublicInstanceWithMixins<
       InferredProps,
-      ExtractMixinSetupBindings<Mixin> &
-        ExtractMixinSetupBindings<Extends> &
-        SetupBindings,
-      ExtractMixinData<Mixin> & ExtractMixinData<Extends>,
-      ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & {},
-      ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & MethodOptions
+      SetupBindings,
+      {},
+      {},
+      MethodOptions,
+      Mixin,
+      Extends
     >
   > &
     ThisType<
-      ComponentPublicInstance<
+      CreateComponentPublicInstanceWithMixins<
         InferredProps,
-        ExtractMixinSetupBindings<Mixin> &
-          ExtractMixinSetupBindings<Extends> &
-          SetupBindings,
-        ExtractMixinData<Mixin> &
-          ExtractMixinData<Extends> &
-          EnsureNonVoid<Data>,
-        ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
-        ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
+        SetupBindings,
+        Data,
+        Computed,
+        Methods,
+        Mixin,
+        Extends,
         ResolvedEmits,
         {}, // PublicProps
         {}, // Defaults
         false,
-        {},
         InjectOptions,
         Slots,
+        {},
+        {},
         Exposed,
         TypeRefs,
         TypeEl,
+        {},
         ResolvedTypeEmits,
-        true
+        true,
+        {}
       > & {
         $options: typeof options
       }
@@ -443,13 +443,14 @@ export function defineComponent<
 ): DefineComponent2<{
   setup(): SetupBindings
   data(): Data
-  props: NormalizedProps & {}
+  props: NormalizedProps
   computed: Computed
   methods: Methods
   mixins: Mixin[]
   extends: Extends
   emits: NormalizedEmits
   slots: Slots
+  inject: {} // omitted
   components: LocalComponents
   directives: Directives
   provide: Provide
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 4830d1990bf..25de07a8bf0 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -64,6 +64,7 @@ import type { Directive } from './directives'
 import {
   type ComponentPublicInstance,
   type CreateComponentPublicInstanceWithMixins,
+  type ExtractMixinProps,
   isReservedPrefix,
 } from './componentPublicInstance'
 import { warn } from './warning'
@@ -129,7 +130,10 @@ export interface ComponentOptionsBase<
     ComponentCustomOptions {
   setup?: (
     this: void,
-    props: LooseRequired<Props>,
+    props: LooseRequired<
+      Props &
+        ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+    >,
     ctx: SetupContext<E, S>,
   ) => Promise<RawBindings> | RawBindings | RenderFunction | void
   name?: string
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index d869d8f56c8..2d7abf199fa 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -53,7 +53,10 @@ import { currentRenderingInstance } from './componentRenderContext'
 import { warn } from './warning'
 import { installCompatInstanceProperties } from './compat/instance'
 import type { Directive } from './directives'
-import type { ExtractPropTypes } from './componentProps'
+import type {
+  ExtractDefaultPropTypes,
+  ExtractPropTypes,
+} from './componentProps'
 
 /**
  * Custom properties added to component instances in any way and can be accessed through `this`
@@ -214,9 +217,30 @@ export type CreateComponentPublicInstanceWithMixins<
   TypeRefs extends Data = {},
   TypeEl extends Element = any,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
+  TypeEmits = unknown,
+  StrictEmits extends boolean = false,
+  Options = ComponentOptionsBase<
+    P,
+    B,
+    D,
+    C,
+    M,
+    Mixin,
+    Extends,
+    E,
+    string,
+    Defaults,
+    {},
+    string,
+    S,
+    LC,
+    Directives,
+    Exposed,
+    Provide
+  >,
   // mixin inference
-  PublicP = ExtractPropTypes<
-    ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>
+  PublicP = Readonly<
+    ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
   > &
     P,
   PublicB = ExtractMixinSetupBindings<Mixin> &
@@ -231,7 +255,10 @@ export type CreateComponentPublicInstanceWithMixins<
   PublicM extends MethodOptions = ExtractMixinMethods<Mixin> &
     ExtractMixinMethods<Extends> &
     M,
-  PublicDefaults = {} & Defaults, // TODO
+  PublicDefaults = ExtractDefaultPropTypes<
+    ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>
+  > &
+    Defaults,
 > = ComponentPublicInstance<
   PublicP,
   PublicB,
@@ -242,30 +269,14 @@ export type CreateComponentPublicInstanceWithMixins<
   PublicProps,
   PublicDefaults,
   MakeDefaultsOptional,
-  ComponentOptionsBase<
-    P,
-    B,
-    D,
-    C,
-    M,
-    Mixin,
-    Extends,
-    E,
-    string,
-    Defaults,
-    {},
-    string,
-    S,
-    LC,
-    Directives,
-    Exposed,
-    Provide
-  >,
+  Options,
   I,
   S,
   Exposed,
   TypeRefs,
-  TypeEl
+  TypeEl,
+  TypeEmits,
+  StrictEmits
 >
 
 export type ExposedKeys<

From 419b5784b18bcdc2f645debed905dc5fb88d7788 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 27 Feb 2025 02:34:31 +0800
Subject: [PATCH 115/127] dont infer $options by default

---
 .../src/componentPublicInstance.ts            | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 2d7abf199fa..5d58972e314 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -219,25 +219,7 @@ export type CreateComponentPublicInstanceWithMixins<
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   TypeEmits = unknown,
   StrictEmits extends boolean = false,
-  Options = ComponentOptionsBase<
-    P,
-    B,
-    D,
-    C,
-    M,
-    Mixin,
-    Extends,
-    E,
-    string,
-    Defaults,
-    {},
-    string,
-    S,
-    LC,
-    Directives,
-    Exposed,
-    Provide
-  >,
+  Options = any,
   // mixin inference
   PublicP = Readonly<
     ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>

From 7e2149e27da9a4124ad5e4edd6c2f5138a0674cb Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 27 Feb 2025 02:53:20 +0800
Subject: [PATCH 116/127] add __defaults for language-tools use

---
 packages/runtime-core/src/apiDefineComponent.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index f3ccd8280ab..a8f3eae52ac 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -318,6 +318,7 @@ export function defineComponent<
   TypeEmits extends ComponentTypeEmits | unknown = unknown,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
+  Defaults = {},
   RawPropsOptions extends ComponentPropsOptions = {},
   RawEmitsOptions extends EmitsOptions = string[],
   InjectOptions extends ComponentInjectOptions = {},
@@ -368,6 +369,10 @@ export function defineComponent<
 >(
   options: {
     props?: ComponentObjectPropsOptions | RawPropsOptions | _PropsKeys[]
+    /**
+     * @private for language-tools use only
+     */
+    __defaults?: Defaults
     /**
      * @private for language-tools use only
      */
@@ -455,7 +460,7 @@ export function defineComponent<
   directives: Directives
   provide: Provide
   expose: Exposed
-  __defaults: unknown
+  __defaults: Defaults
   __typeProps: TypeProps
   __typeEmits: TypeEmits
   __typeRefs: TypeRefs

From 7819a2d418d99e34b48de9b839d7d09a50fa4cdc Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 27 Feb 2025 03:00:08 +0800
Subject: [PATCH 117/127] Revert "add __defaults for language-tools use"

This reverts commit 7e2149e27da9a4124ad5e4edd6c2f5138a0674cb.
---
 packages/runtime-core/src/apiDefineComponent.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index a8f3eae52ac..f3ccd8280ab 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -318,7 +318,6 @@ export function defineComponent<
   TypeEmits extends ComponentTypeEmits | unknown = unknown,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
-  Defaults = {},
   RawPropsOptions extends ComponentPropsOptions = {},
   RawEmitsOptions extends EmitsOptions = string[],
   InjectOptions extends ComponentInjectOptions = {},
@@ -369,10 +368,6 @@ export function defineComponent<
 >(
   options: {
     props?: ComponentObjectPropsOptions | RawPropsOptions | _PropsKeys[]
-    /**
-     * @private for language-tools use only
-     */
-    __defaults?: Defaults
     /**
      * @private for language-tools use only
      */
@@ -460,7 +455,7 @@ export function defineComponent<
   directives: Directives
   provide: Provide
   expose: Exposed
-  __defaults: Defaults
+  __defaults: unknown
   __typeProps: TypeProps
   __typeEmits: TypeEmits
   __typeRefs: TypeRefs

From e9a8f8d0f2c3f70274edf37d66288a9b58147f29 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 27 Feb 2025 03:03:57 +0800
Subject: [PATCH 118/127] refactor

---
 packages/runtime-core/src/apiDefineComponent.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index f3ccd8280ab..133b0dd600d 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -45,10 +45,6 @@ export type PublicProps = VNodeProps &
   AllowedComponentProps &
   ComponentCustomProps
 
-type NormalizePropsOptions<T> = ComponentPropsOptions extends T ? {} : T
-
-type NormalizeEmitsOptions<T> = EmitsOptions extends T ? {} : T
-
 export interface ComponentOptionsSchema {
   setup(): unknown
   data(): unknown
@@ -338,8 +334,12 @@ export function defineComponent<
   _InjectKeys extends string = string,
   // resolved types
   NormalizedProps extends
-    ComponentPropsOptions = NormalizePropsOptions<RawPropsOptions>,
-  NormalizedEmits extends EmitsOptions = NormalizeEmitsOptions<RawEmitsOptions>,
+    ComponentPropsOptions = ComponentPropsOptions extends RawPropsOptions
+    ? {}
+    : RawPropsOptions,
+  NormalizedEmits extends EmitsOptions = EmitsOptions extends RawEmitsOptions
+    ? string[]
+    : RawEmitsOptions,
   ResolvedEmits extends ObjectEmitsOptions = ResolveEmitsOptions<
     NormalizedEmits,
     TypeEmits

From 05f6fa8354db47ac18c1700ac265db701c8db66c Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 10 Mar 2025 00:11:17 +0800
Subject: [PATCH 119/127] Fix vuetify regression

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 133b0dd600d..e41aad391ca 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -99,7 +99,7 @@ export type DefineComponent<
     methods: M
     mixins: Mixin[]
     extends: Extends
-    emits: E
+    emits: Record<string, unknown> extends E ? {} : E
     slots: S
     inject: {}
     components: LC

From c22163bcdcdc047d2dc2527c4c85c5c7ccd07c40 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 10 Mar 2025 00:59:48 +0800
Subject: [PATCH 120/127] Fix vuetify regression

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index e41aad391ca..3d2824aeeaf 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -91,7 +91,7 @@ export type DefineComponent<
 > = InferComponent<
   {
     setup(): RawBindings
-    data(): D
+    data(): unknown extends D ? {} : D
     props: PropsOrPropOptions extends ComponentPropsOptions
       ? PropsOrPropOptions
       : {}

From dd02331314b4f8343fbec8e0a74e75fc5ee54471 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 10 Mar 2025 01:02:27 +0800
Subject: [PATCH 121/127] Fix pinia regression

---
 packages/reactivity/src/computed.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/reactivity/src/computed.ts b/packages/reactivity/src/computed.ts
index 6ecf2a5cc6a..a17a2b475d5 100644
--- a/packages/reactivity/src/computed.ts
+++ b/packages/reactivity/src/computed.ts
@@ -87,7 +87,10 @@ export class ComputedRefImpl<T = any> implements Dependency, Subscriber {
   get dep(): Dependency {
     return this
   }
-  // for backwards compat
+  /**
+   * for backwards compat
+   * @internal
+   */
   get _dirty(): boolean {
     const flags = this.flags
     if (
@@ -99,6 +102,10 @@ export class ComputedRefImpl<T = any> implements Dependency, Subscriber {
     }
     return false
   }
+  /**
+   * for backwards compat
+   * @internal
+   */
   set _dirty(v: boolean) {
     if (v) {
       this.flags |= SubscriberFlags.Dirty

From c0bfaaf5c91421083e2299214d4aadf6e08978ee Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 10 Mar 2025 01:16:12 +0800
Subject: [PATCH 122/127] Fix vuetify regression

---
 packages/runtime-core/src/apiDefineComponent.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 3d2824aeeaf..2b250978860 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -118,7 +118,9 @@ export type DefineComponent<
   false
 >
 
-export type DefineComponent2<T extends ComponentOptionsSchema> = InferComponent<
+export type DefineComponent2<T extends ComponentOptionsSchema> = {
+  props?: T['props']
+} & InferComponent<
   T,
   // MakeDefaultsOptional - if TypeProps is provided, set to false to use
   // user props types verbatim
@@ -177,8 +179,6 @@ type InferComponent<
   T['expose'],
   T['provide']
 > & {
-  props?: T['props']
-
   /**
    * #3468
    *

From 43a5295d46740d8470a47f3cf15ec71444f8e201 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 10 Mar 2025 01:59:45 +0800
Subject: [PATCH 123/127] Fix vue-macros regression

---
 packages/runtime-core/__tests__/apiOptions.spec.ts   | 12 ++++++++++++
 packages/runtime-core/src/apiDefineComponent.ts      |  2 ++
 packages/runtime-core/src/componentPublicInstance.ts |  8 +++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/__tests__/apiOptions.spec.ts b/packages/runtime-core/__tests__/apiOptions.spec.ts
index fc942bbe054..56746a61702 100644
--- a/packages/runtime-core/__tests__/apiOptions.spec.ts
+++ b/packages/runtime-core/__tests__/apiOptions.spec.ts
@@ -931,6 +931,18 @@ describe('api: options', () => {
     expect(calls).toEqual(['base', 'mixin', 'comp'])
   })
 
+  test('extends type props', () => {
+    const Base = defineComponent({
+      __typeProps: {} as { a: number },
+    })
+    defineComponent({
+      extends: Base,
+      render() {
+        return `${this.a}`
+      },
+    })
+  })
+
   test('beforeCreate/created in extends and mixins', () => {
     const calls: string[] = []
     const BaseA = {
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 2b250978860..ab066f3991e 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -179,6 +179,8 @@ type InferComponent<
   T['expose'],
   T['provide']
 > & {
+  __typeProps?: T['__typeProps']
+
   /**
    * #3468
    *
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 5d58972e314..95aaf1f167f 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -93,6 +93,10 @@ export type ExtractMixinProps<T> = UnionToIntersection<
     : {}
 >
 
+export type ExtractMixinTypeProps<T> = UnionToIntersection<
+  T extends { __typeProps?: infer P } ? P : {}
+>
+
 export type ExtractMixinEmits<T> = UnionToIntersection<
   T extends { emits?: infer E }
     ? E extends (infer K extends string)[]
@@ -222,7 +226,9 @@ export type CreateComponentPublicInstanceWithMixins<
   Options = any,
   // mixin inference
   PublicP = Readonly<
-    ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+    ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>> &
+      ExtractMixinTypeProps<Mixin> &
+      ExtractMixinTypeProps<Extends>
   > &
     P,
   PublicB = ExtractMixinSetupBindings<Mixin> &

From a4f51608867f7f3eef6762b25fa5c75f3172c260 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 10 Mar 2025 03:46:21 +0800
Subject: [PATCH 124/127] Add __defaults option

---
 packages/runtime-core/src/apiDefineComponent.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ab066f3991e..ae9a50a0bfe 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -316,6 +316,7 @@ export function defineComponent<
   TypeEmits extends ComponentTypeEmits | unknown = unknown,
   TypeRefs extends Record<string, unknown> = {},
   TypeEl extends Element = any,
+  Defaults = unknown,
   RawPropsOptions extends ComponentPropsOptions = {},
   RawEmitsOptions extends EmitsOptions = string[],
   InjectOptions extends ComponentInjectOptions = {},
@@ -386,6 +387,10 @@ export function defineComponent<
      * @private for language-tools use only
      */
     __typeEl?: TypeEl
+    /**
+     * @private for language-tools use only
+     */
+    __defaults?: Defaults
   } & ComponentOptionsBase<
     InferredProps,
     SetupBindings,
@@ -457,11 +462,11 @@ export function defineComponent<
   directives: Directives
   provide: Provide
   expose: Exposed
-  __defaults: unknown
   __typeProps: TypeProps
   __typeEmits: TypeEmits
   __typeRefs: TypeRefs
   __typeEl: TypeEl
+  __defaults: Defaults
 }>
 
 // implementation, close to no-op

From fb924461063079710c331730567d27ad41baad0c Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 10 Mar 2025 14:54:17 +0800
Subject: [PATCH 125/127] Extract mixin emits in ComponentOptionsBase,
 CreateComponentPublicInstanceWithMixins

---
 packages/runtime-core/src/apiDefineComponent.ts     | 13 +++----------
 packages/runtime-core/src/componentOptions.ts       |  9 ++++++++-
 .../runtime-core/src/componentPublicInstance.ts     |  5 +++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ae9a50a0bfe..4940d892d5a 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -33,10 +33,7 @@ import type {
   ExtractDefaultPropTypes,
   ExtractPropTypes,
 } from './componentProps'
-import type {
-  CreateComponentPublicInstanceWithMixins,
-  ExtractMixinEmits,
-} from './componentPublicInstance'
+import type { CreateComponentPublicInstanceWithMixins } from './componentPublicInstance'
 import type { SlotsType } from './componentSlots'
 import type { Directive } from './directives'
 import type { VNodeProps } from './vnode'
@@ -150,9 +147,7 @@ type InferComponent<
     > &
       T['__typeProps'] &
       EmitsToProps<
-        ExtractMixinEmits<Mixin> &
-          ExtractMixinEmits<Extends> &
-          ResolvedEmits &
+        ResolvedEmits &
           TypeEmitsToOptions<
             string[] extends T['emits']
               ? T['__typeEmits'] & {}
@@ -358,9 +353,7 @@ export function defineComponent<
     > &
       TypeProps &
       EmitsToProps<
-        ExtractMixinEmits<Mixin> &
-          ExtractMixinEmits<Extends> &
-          ResolvedEmits &
+        ResolvedEmits &
           TypeEmitsToOptions<
             string[] extends NormalizedEmits
               ? TypeEmits & {}
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 25de07a8bf0..357b33def6f 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -64,7 +64,9 @@ import type { Directive } from './directives'
 import {
   type ComponentPublicInstance,
   type CreateComponentPublicInstanceWithMixins,
+  type ExtractMixinEmits,
   type ExtractMixinProps,
+  type ExtractMixinTypeProps,
   isReservedPrefix,
 } from './componentPublicInstance'
 import { warn } from './warning'
@@ -132,7 +134,12 @@ export interface ComponentOptionsBase<
     this: void,
     props: LooseRequired<
       Props &
-        ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>>
+        ExtractPropTypes<
+          ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>
+        > &
+        ExtractMixinTypeProps<Mixin> &
+        ExtractMixinTypeProps<Extends> &
+        EmitsToProps<ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends> & {}>
     >,
     ctx: SetupContext<E, S>,
   ) => Promise<RawBindings> | RawBindings | RenderFunction | void
diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts
index 95aaf1f167f..abb2f9a00e8 100644
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@ -46,7 +46,7 @@ import {
   resolveMergedOptions,
   shouldCacheAccess,
 } from './componentOptions'
-import type { EmitFn, EmitsOptions } from './componentEmits'
+import type { EmitFn, EmitsOptions, EmitsToProps } from './componentEmits'
 import type { SlotsType, UnwrapSlotsType } from './componentSlots'
 import { markAttrsAccessed } from './componentRenderUtils'
 import { currentRenderingInstance } from './componentRenderContext'
@@ -228,7 +228,8 @@ export type CreateComponentPublicInstanceWithMixins<
   PublicP = Readonly<
     ExtractPropTypes<ExtractMixinProps<Mixin> & ExtractMixinProps<Extends>> &
       ExtractMixinTypeProps<Mixin> &
-      ExtractMixinTypeProps<Extends>
+      ExtractMixinTypeProps<Extends> &
+      EmitsToProps<ExtractMixinEmits<Mixin> & ExtractMixinEmits<Extends> & {}>
   > &
     P,
   PublicB = ExtractMixinSetupBindings<Mixin> &

From 4001f7d05007db0a9db44a400f912d8d15a255e1 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Mon, 10 Mar 2025 15:56:34 +0800
Subject: [PATCH 126/127] Expose props in InferComponent

---
 packages/runtime-core/src/apiDefineComponent.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 4940d892d5a..b5ba9c40866 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -115,9 +115,7 @@ export type DefineComponent<
   false
 >
 
-export type DefineComponent2<T extends ComponentOptionsSchema> = {
-  props?: T['props']
-} & InferComponent<
+export type DefineComponent2<T extends ComponentOptionsSchema> = InferComponent<
   T,
   // MakeDefaultsOptional - if TypeProps is provided, set to false to use
   // user props types verbatim
@@ -174,6 +172,7 @@ type InferComponent<
   T['expose'],
   T['provide']
 > & {
+  props?: T['props']
   __typeProps?: T['__typeProps']
 
   /**

From e1bc0eb02e22bc0c236e1471c11d96a368764b72 Mon Sep 17 00:00:00 2001
From: Johnson Chu <johnsoncodehk@gmail.com>
Date: Thu, 13 Mar 2025 22:00:34 +0800
Subject: [PATCH 127/127] Expose __typeEmits

---
 packages/runtime-core/src/apiDefineComponent.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index b5ba9c40866..ec0e6c1fe0e 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -174,6 +174,7 @@ type InferComponent<
 > & {
   props?: T['props']
   __typeProps?: T['__typeProps']
+  __typeEmits?: T['__typeEmits']
 
   /**
    * #3468