fix(types): improve ref typing, close #759

diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts
index 65e1b8dd01655f8aa905627837a07ebc6b4dadda..b36b3308b3946d7805426da06ac31cf3898b65b0 100644 (file)
--- a/packages/reactivity/src/ref.ts
+++ b/packages/reactivity/src/ref.ts
@@ -23,12 +23,12 @@ export interface Ref<T = any> {
 const convert = <T extends unknown>(val: T): T =>
   isObject(val) ? reactive(val) : val
 
-export function isRef<T>(r: Ref<T> | T): r is Ref<T>
+export function isRef<T>(r: Ref<T> | unknown): r is Ref<T>
 export function isRef(r: any): r is Ref {
   return r ? r._isRef === true : false
 }
 
-export function ref<T extends Ref>(value: T): T
+export function ref<T>(value: T): T extends Ref ? T : Ref<T>
 export function ref<T>(value: T): Ref<T>
 export function ref<T = any>(): Ref<T>
 export function ref(value?: unknown) {

diff --git a/test-dts/ref.test-d.ts b/test-dts/ref.test-d.ts
new file mode 100644 (file)
index 0000000..ad8c22f
--- /dev/null
+++ b/test-dts/ref.test-d.ts
@@ -0,0 +1,16 @@
+import { expectType } from 'tsd'
+import { Ref, ref } from './index'
+import { isRef } from '@vue/reactivity'
+
+function foo(arg: number | Ref<number>) {
+  // ref coercing
+  const coerced = ref(arg)
+  expectType<Ref<number>>(coerced)
+
+  // isRef as type guard
+  if (isRef(arg)) {
+    expectType<Ref<number>>(arg)
+  }
+}
+
+foo(1)