wip [skip ci]

Author: johnsoncodehk

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[]

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() {},

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

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`)