From af0fb98c9ea91650b11e4a104d356003acefd602 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Sat, 16 Feb 2019 21:58:10 +0800
Subject: [PATCH] [improvement] enable tsx type checking for functional
 component (#2764)

---
 jest.config.js               |  2 +-
 packages/utils/functional.ts |  2 +-
 packages/utils/use/sfc.ts    | 30 ++++++++++++++++++------------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index e966e49e8..13b19358d 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -3,7 +3,7 @@ module.exports = {
   setupFiles: ['<rootDir>/test/jest.init.js'],
   moduleFileExtensions: ['js', 'vue', 'ts', 'tsx'],
   transform: {
-    '^.+\\.js$': '<rootDir>/test/jest.transform.js',
+    '^.+\\.(js|ts|tsx)$': '<rootDir>/test/jest.transform.js',
     '.*\\.(vue)$': '<rootDir>/node_modules/vue-jest'
   },
   moduleNameMapper: {
diff --git a/packages/utils/functional.ts b/packages/utils/functional.ts
index 303c984ef..809283d5d 100644
--- a/packages/utils/functional.ts
+++ b/packages/utils/functional.ts
@@ -21,7 +21,7 @@ const inheritKey = [
 const mapInheritKey: ObjectIndex = { nativeOn: 'on' };
 
 // inherit partial context, map nativeOn to on
-export function inherit(context: Context, inheritListeners: boolean): InheritContext {
+export function inherit(context: Context, inheritListeners?: boolean): InheritContext {
   const result = inheritKey.reduce(
     (obj, key) => {
       if (context.data[key]) {
diff --git a/packages/utils/use/sfc.ts b/packages/utils/use/sfc.ts
index 6b3274ad3..bedd34142 100644
--- a/packages/utils/use/sfc.ts
+++ b/packages/utils/use/sfc.ts
@@ -10,25 +10,27 @@ import Vue, {
   CreateElement,
   RenderContext
 } from 'vue/types';
-import { VNode, ScopedSlot } from 'vue/types/vnode';
+import { VNode } from 'vue/types/vnode';
 import { InjectOptions, PropsDefinition } from 'vue/types/options';
 
-type VantComponentOptions = ComponentOptions<Vue> & {
+export type ScopedSlot = (props?: any) => VNode[] | undefined;
+
+export type VantComponentOptions = ComponentOptions<Vue> & {
   functional?: boolean;
   install?: (Vue: VueConstructor) => void;
 };
 
-type DefaultProps = Record<string, any>;
+export type DefaultProps = Record<string, any>;
 
-type VantPureComponent<
+export type FunctionalComponent<
   Props = DefaultProps,
   PropDefs = PropsDefinition<Props>
 > = {
   (
     h: CreateElement,
-    props: { [key: string]: any },
+    props: Props,
     slots: { [key: string]: ScopedSlot | undefined },
-    context: RenderContext
+    context: RenderContext<Props>
   ): VNode;
   props?: PropDefs;
   model?: {
@@ -38,6 +40,8 @@ type VantPureComponent<
   inject?: InjectOptions;
 };
 
+export type VantTsxComponent<T> = (props: T) => VNode;
+
 const arrayProp = {
   type: Array,
   default: () => []
@@ -80,7 +84,9 @@ export function unifySlots(context: RenderContext) {
   return scopedSlots;
 }
 
-function transformPureComponent(pure: VantPureComponent): VantComponentOptions {
+function transformFunctionalComponent(
+  pure: FunctionalComponent
+): VantComponentOptions {
   return {
     functional: true,
     props: pure.props,
@@ -89,11 +95,11 @@ function transformPureComponent(pure: VantPureComponent): VantComponentOptions {
   };
 }
 
-export default (name: string) => (
-  sfc: VantComponentOptions | VantPureComponent
-) => {
+export default (name: string) => <T = DefaultProps>(
+  sfc: VantComponentOptions | FunctionalComponent
+): VantTsxComponent<T> => {
   if (typeof sfc === 'function') {
-    sfc = transformPureComponent(sfc);
+    sfc = transformFunctionalComponent(sfc);
   }
 
   if (!sfc.functional) {
@@ -108,5 +114,5 @@ export default (name: string) => (
   sfc.name = name;
   sfc.install = install;
 
-  return sfc;
+  return sfc as VantTsxComponent<T>;
 };