wip

Author: johnsoncodehk

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> = {},

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> &

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 = {},

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 = {},

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> = {},