wip: adjust computed ref type

diff --git a/packages/reactivity/src/computed.ts b/packages/reactivity/src/computed.ts
index b23bdfcde822a18e9b89897636b064c1050bef21..9ffbbf0b52b6cbaf4e97ba6cdbc8a9943154c75c 100644 (file)
--- a/packages/reactivity/src/computed.ts
+++ b/packages/reactivity/src/computed.ts
@@ -1,8 +1,8 @@
 import { effect, ReactiveEffect, activeReactiveEffectStack } from './effect'
-import { knownValues } from './ref'
+import { UnwrapNestedRefs, knownValues } from './ref'
 
 export interface ComputedRef<T> {
-  readonly value: T
+  readonly value: UnwrapNestedRefs<T>
   readonly effect: ReactiveEffect
 }
 

diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts
index d0dc26fed971a0e248c2a94d810fa481b4fa26fc..6c2e134ea2f2854c92775714cdf9b57e31722e0d 100644 (file)
--- a/packages/reactivity/src/ref.ts
+++ b/packages/reactivity/src/ref.ts
@@ -6,9 +6,11 @@ import { reactive } from './reactive'
 export const knownValues = new WeakSet()
 
 export interface Ref<T> {
-  value: T extends Ref<infer V> ? Ref<V> : UnwrapRef<T>
+  value: UnwrapNestedRefs<T>
 }
 
+export type UnwrapNestedRefs<T> = T extends Ref<infer V> ? Ref<V> : UnwrapRef<T>
+
 const convert = (val: any): any => (isObject(val) ? reactive(val) : val)
 
 export function ref<T>(raw: T): Ref<T> {