fix: remove ExtractPropsAndEvents util

Author: rudyxu1102

packages/dts-test/defineComponent.test-d.tsx

@@ -14,8 +14,7 @@ import {
   Slots,
   VNode,
   ImgHTMLAttributes,
-  StyleValue,
-  ExtractPropsAndEvents
+  StyleValue
 } from 'vue'
 import { describe, expectType, IsUnion, test } from './utils'
 
@@ -1360,7 +1359,7 @@ describe('define attrs', () => {
       props: {
         bar: Number
       },
-      attrs: Object as AttrsType<ExtractPropsAndEvents<typeof Child>>,
+      attrs: Object as AttrsType<typeof Child>,
       created() {
         expectType<unknown>(this.$attrs.class)
         expectType<unknown>(this.$attrs.style)

packages/runtime-core/src/componentOptions.ts

@@ -61,7 +61,8 @@ import {
   ComponentPublicInstance,
   isReservedPrefix,
   IntersectionMixin,
-  UnwrapMixinsType
+  UnwrapMixinsType,
+  ComponentPublicInstanceConstructor
 } from './componentPublicInstance'
 import { warn } from './warning'
 import { VNodeChild } from './vnode'
@@ -419,12 +420,10 @@ export type ComponentOptionsMixin = ComponentOptionsBase<
 
 declare const AttrSymbol: unique symbol
 export type AttrsType<T extends Record<string, any> = Record<string, any>> = {
-  [AttrSymbol]?: T
+  [AttrSymbol]?: T extends ComponentPublicInstanceConstructor
+    ? InstanceType<T>['$props']
+    : T
 }
-// extract props and event types from components
-export type ExtractPropsAndEvents<
-  T extends abstract new (...args: any) => any
-> = InstanceType<T>['$props']
 
 export type UnwrapAttrsType<
   Attrs extends AttrsType,

packages/runtime-core/src/index.ts

@@ -247,8 +247,7 @@ export type {
   ComputedOptions,
   RuntimeCompilerOptions,
   ComponentInjectOptions,
-  AttrsType,
-  ExtractPropsAndEvents
+  AttrsType
 } from './componentOptions'
 export type { EmitsOptions, ObjectEmitsOptions } from './componentEmits'
 export type {