wip [skip ci]

Author: johnsoncodehk

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,

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'
 
 /**

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