test: add dts tests for defineComponent

vuejs · Jun 23, 2020 · 2d8b0cc · 2d8b0cc
1 parent 9047e4a
commit 2d8b0cc
Show file tree

Hide file tree

Showing 5 changed files with 629 additions and 12 deletions.
diff --git a/src/component/componentOptions.ts b/src/component/componentOptions.ts
@@ -1,11 +1,7 @@
 import { Data } from './common'
 import { ComponentPropsOptions, ExtractPropTypes } from './componentProps'
 import { VNode } from 'vue'
-import {
-  ComponentInstance,
-  VueProxy,
-  ComponentRenderProxy,
-} from './componentProxy'
+import { ComponentInstance, ComponentRenderProxy } from './componentProxy'
 
 import { ComponentOptions as Vue2ComponentOptions } from 'vue'
 
@@ -52,7 +48,7 @@ interface ComponentOptionsBase<
     Vue2ComponentOptions<Vue, D, M, C, Props>,
     'data' | 'computed' | 'method' | 'setup' | 'props'
   > {
-  data?: D | (() => D)
+  data?: (this: Props, vm: Props) => D
   computed?: C
   methods?: M
 }

diff --git a/src/component/componentProxy.ts b/src/component/componentProxy.ts
@@ -25,18 +25,19 @@ export type ComponentRenderProxy<
   PublicProps = P
 > = {
   $data: D
-  $props: P & PublicProps
+  $props: Readonly<P & PublicProps>
   $attrs: Data
   $refs: Data
   $slots: Data
   $root: ComponentInstance | null
   $parent: ComponentInstance | null
   $emit: (event: string, ...args: unknown[]) => void
-} & P &
+} & Readonly<P> &
   UnwrapRef<B> &
   D &
   M &
-  ExtractComputedReturns<C>
+  ExtractComputedReturns<C> &
+  Vue
 
 // for Vetur and TSX support
 type VueConstructorProxy<PropsOptions, RawBindings> = VueConstructor & {
@@ -55,8 +56,8 @@ export type VueProxy<
   PropsOptions,
   RawBindings,
   Data = DefaultData<Vue>,
-  Methods = DefaultMethods<Vue>,
-  Computed = DefaultComputed
+  Computed = DefaultComputed,
+  Methods = DefaultMethods<Vue>
 > = Vue2ComponentOptions<
   Vue,
   UnwrapRef<RawBindings> & Data,

diff --git a/src/component/defineComponent.ts b/src/component/defineComponent.ts
@@ -8,6 +8,7 @@ import {
 } from './componentOptions'
 import { VueProxy } from './componentProxy'
 import { Data } from './common'
+import { HasDefined } from '../types/basic'
 
 // overload 1: object format with no props
 export function defineComponent<
@@ -43,7 +44,9 @@ export function defineComponent<
   M extends MethodOptions = {},
   PropsOptions extends ComponentPropsOptions = ComponentPropsOptions
 >(
-  options: ComponentOptionsWithProps<PropsOptions, RawBindings, D, C, M>
+  options: HasDefined<Props> extends true
+    ? ComponentOptionsWithProps<PropsOptions, RawBindings, D, C, M, Props>
+    : ComponentOptionsWithProps<PropsOptions, RawBindings, D, C, M>
 ): VueProxy<PropsOptions, RawBindings, D, C, M>
 // implementation, close to no-op
 export function defineComponent(options: any) {