wip(types): fix type defaults

Author: pikax

types/options.d.ts

@@ -20,6 +20,7 @@ export type Component<
   | typeof Vue
   | FunctionalComponentOptions<Props>
   | ComponentOptions<never, Data, Methods, Computed, Props, SetupBindings>
+  | DefineComponent<any, any, any, any, any>
 
 type EsModule<T> = T | { default: T }
 

types/v3-component-options.d.ts

@@ -3,7 +3,11 @@ import { VNode } from './vnode'
 import { ComponentOptions as Vue2ComponentOptions } from './options'
 import { EmitsOptions, SetupContext } from './v3-setup-context'
 import { Data, LooseRequired, UnionToIntersection } from './common'
-import { ComponentPropsOptions, ExtractPropTypes } from './v3-component-props'
+import {
+  ComponentPropsOptions,
+  ExtractDefaultPropTypes,
+  ExtractPropTypes
+} from './v3-component-props'
 import { CreateComponentPublicInstance } from './v3-component-public-instance'
 export { ComponentPropsOptions } from './v3-component-props'
 
@@ -60,7 +64,8 @@ type ExtractOptionProp<T> = T extends ComponentOptionsBase<
   any, // M
   any, // Mixin
   any, // Extends
-  any // EmitsOptions
+  any, // EmitsOptions
+  any // Defaults
 >
   ? unknown extends P
     ? {}
@@ -76,10 +81,11 @@ export interface ComponentOptionsBase<
   Mixin extends ComponentOptionsMixin,
   Extends extends ComponentOptionsMixin,
   Emits extends EmitsOptions,
-  EmitNames extends string = string
+  EmitNames extends string = string,
+  Defaults = {}
 > extends Omit<
       Vue2ComponentOptions<Vue, D, M, C, Props>,
-      'data' | 'computed' | 'method' | 'setup' | 'props' | 'mixins' | 'extends'
+      'data' | 'computed' | 'methods' | 'setup' | 'props' | 'mixins' | 'extends'
     >,
     ComponentCustomOptions {
   // rewrite options api types
@@ -88,6 +94,7 @@ export interface ComponentOptionsBase<
     vm: CreateComponentPublicInstance<Props, {}, {}, {}, M, Mixin, Extends>
   ) => D
   computed?: C
+  methods?: M
   mixins?: Mixin[]
   extends?: Extends
   emits?: (Emits | EmitNames[]) & ThisType<void>
@@ -102,6 +109,8 @@ export interface ComponentOptionsBase<
     RawBindings,
     Emits
   >
+
+  __defaults?: Defaults
 }
 
 export type ComponentOptionsMixin = ComponentOptionsBase<
@@ -112,6 +121,8 @@ export type ComponentOptionsMixin = ComponentOptionsBase<
   any,
   any,
   any,
+  any,
+  any,
   any
 >
 
@@ -133,7 +144,8 @@ export type ComponentOptionsWithProps<
   Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
   Emits extends EmitsOptions = {},
   EmitsNames extends string = string,
-  Props = ExtractPropTypes<PropsOptions>
+  Props = ExtractPropTypes<PropsOptions>,
+  Defaults = ExtractDefaultPropTypes<PropsOptions>
 > = ComponentOptionsBase<
   Props,
   RawBindings,
@@ -143,7 +155,8 @@ export type ComponentOptionsWithProps<
   Mixin,
   Extends,
   Emits,
-  EmitsNames
+  EmitsNames,
+  Defaults
 > & {
   props?: PropsOptions
 } & ThisType<
@@ -179,7 +192,8 @@ export type ComponentOptionsWithArrayProps<
   Mixin,
   Extends,
   Emits,
-  EmitsNames
+  EmitsNames,
+  {}
 > & {
   props?: PropNames[]
 } & ThisType<
@@ -214,7 +228,8 @@ export type ComponentOptionsWithoutProps<
   Mixin,
   Extends,
   Emits,
-  EmitsNames
+  EmitsNames,
+  {}
 > & {
   props?: undefined
 } & ThisType<

types/v3-component-public-instance.d.ts

@@ -70,9 +70,10 @@ type MixinToOptionTypes<T> = T extends ComponentOptionsBase<
   infer Mixin,
   infer Extends,
   any,
-  any
+  any,
+  infer Defaults
 >
-  ? OptionTypesType<P & {}, B & {}, D & {}, C & {}, M & {}> &
+  ? OptionTypesType<P & {}, B & {}, D & {}, C & {}, M & {}, Defaults & {}> &
       IntersectionMixin<Mixin> &
       IntersectionMixin<Extends>
   : never
@@ -83,7 +84,7 @@ type ExtractMixin<T> = {
 }[T extends ComponentOptionsMixin ? 'Mixin' : never]
 
 type IntersectionMixin<T> = IsDefaultMixinComponent<T> extends true
-  ? OptionTypesType<{}, {}, {}, {}, {}>
+  ? OptionTypesType<{}, {}, {}, {}, {}, {}>
   : UnionToIntersection<ExtractMixin<T>>
 
 type UnwrapMixinsType<
@@ -139,7 +140,18 @@ export type ComponentPublicInstance<
   PublicProps = P,
   Defaults = {},
   MakeDefaultsOptional extends boolean = false,
-  Options = ComponentOptionsBase<any, any, any, any, any, any, any, any, any>
+  Options = ComponentOptionsBase<
+    any,
+    any,
+    any,
+    any,
+    any,
+    any,
+    any,
+    any,
+    any,
+    any
+  >
 > = {
   // $: ComponentInternalInstance
   $data: D

types/v3-define-component.d.ts

@@ -52,8 +52,18 @@ type DefineComponent<
   > &
     Props
 > &
-  ComponentOptionsBase<Props, RawBindings, D, C, M, Mixin, Extends, E, EE> &
-  Component & {
+  ComponentOptionsBase<
+    Props,
+    RawBindings,
+    D,
+    C,
+    M,
+    Mixin,
+    Extends,
+    E,
+    EE,
+    Defaults
+  > & {
     props: PropsOrPropOptions
   }