From 80e5b16f995240a87cdfbb5da0ca3476864d6e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=A9=E6=95=A3=E6=80=A7=E7=99=BE=E4=B8=87=E7=94=9C?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85?= <himself65@outlook.com>
Date: Wed, 9 Oct 2019 01:48:13 +0800
Subject: [PATCH] types: improve type 'ReactiveEffect' with generics (#99)

---
 packages/reactivity/src/effect.ts     | 22 +++++++++++-----------
 packages/runtime-core/src/apiWatch.ts |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts
index a542e3b65..b47600885 100644
--- a/packages/reactivity/src/effect.ts
+++ b/packages/reactivity/src/effect.ts
@@ -2,11 +2,11 @@ import { OperationTypes } from './operations'
 import { Dep, targetMap } from './reactive'
 import { EMPTY_OBJ, extend } from '@vue/shared'
 
-export interface ReactiveEffect {
-  (): any
+export interface ReactiveEffect<T = any> {
+  (): T
   isEffect: true
   active: boolean
-  raw: Function
+  raw: () => T
   deps: Array<Dep>
   computed?: boolean
   scheduler?: (run: Function) => void
@@ -35,10 +35,10 @@ export const activeReactiveEffectStack: ReactiveEffect[] = []
 
 export const ITERATE_KEY = Symbol('iterate')
 
-export function effect(
-  fn: Function,
+export function effect<T = any>(
+  fn: () => T,
   options: ReactiveEffectOptions = EMPTY_OBJ
-): ReactiveEffect {
+): ReactiveEffect<T> {
   if ((fn as ReactiveEffect).isEffect) {
     fn = (fn as ReactiveEffect).raw
   }
@@ -59,13 +59,13 @@ export function stop(effect: ReactiveEffect) {
   }
 }
 
-function createReactiveEffect(
-  fn: Function,
+function createReactiveEffect<T = any>(
+  fn: () => T,
   options: ReactiveEffectOptions
-): ReactiveEffect {
-  const effect = function effect(...args): any {
+): ReactiveEffect<T> {
+  const effect: ReactiveEffect = function effect(...args: any[]): any {
     return run(effect as ReactiveEffect, fn, args)
-  } as ReactiveEffect
+  }
   effect.isEffect = true
   effect.active = true
   effect.raw = fn
diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
index 8a72d6860..ebbe33c21 100644
--- a/packages/runtime-core/src/apiWatch.ts
+++ b/packages/runtime-core/src/apiWatch.ts
@@ -91,7 +91,7 @@ function doWatch(
   const instance = currentInstance
   const suspense = currentSuspense
 
-  let getter: Function
+  let getter: () => any
   if (isArray(source)) {
     getter = () =>
       source.map(