fix(reactiveComputed): unwrap reactive type

vueuse · Jul 6, 2023 · c33bd6e · c33bd6e
1 parent bddfbae
commit c33bd6e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/packages/shared/reactiveComputed/index.test.ts b/packages/shared/reactiveComputed/index.test.ts
@@ -1,5 +1,5 @@
 import { isVue2, nextTick, ref, watch, watchEffect } from 'vue-demi'
-import { describe, expect, it } from 'vitest'
+import { describe, expect, expectTypeOf, it } from 'vitest'
 import { reactiveComputed } from '.'
 
 describe('reactiveComputed', () => {
@@ -8,9 +8,10 @@ describe('reactiveComputed', () => {
 
     const state = reactiveComputed(() => {
       return {
-        count: count.value,
+        count,
       }
     })
+    expectTypeOf(state).toEqualTypeOf<{ count: number }>()
 
     expect(state.count).toBe(0)
 

diff --git a/packages/shared/reactiveComputed/index.ts b/packages/shared/reactiveComputed/index.ts
@@ -4,6 +4,6 @@ import { toReactive } from '../toReactive'
 /**
  * Computed reactive object.
  */
-export function reactiveComputed<T extends {}>(fn: () => T): T {
+export function reactiveComputed<T extends {}>(fn: () => T) {
   return toReactive(computed(fn))
 }
diff --git a/packages/shared/toReactive/index.ts b/packages/shared/toReactive/index.ts
@@ -1,5 +1,6 @@
-// eslint-disable-next-line no-restricted-imports
-import { isRef, reactive, unref } from 'vue-demi'
+import type { UnwrapNestedRefs } from 'vue-demi'
+import { isRef, reactive } from 'vue-demi'
+import { toValue } from '../toValue'
 import type { MaybeRef } from '../utils'
 
 /**
@@ -10,13 +11,13 @@ import type { MaybeRef } from '../utils'
  */
 export function toReactive<T extends object>(
   objectRef: MaybeRef<T>,
-): T {
+): UnwrapNestedRefs<T> {
   if (!isRef(objectRef))
-    return reactive(objectRef) as T
+    return reactive(objectRef)
 
   const proxy = new Proxy({}, {
     get(_, p, receiver) {
-      return unref(Reflect.get(objectRef.value, p, receiver))
+      return toValue(Reflect.get(objectRef.value, p, receiver))
     },
     set(_, p, value) {
       if (isRef((objectRef.value as any)[p]) && !isRef(value))
@@ -42,5 +43,5 @@ export function toReactive<T extends object>(
     },
   })
 
-  return reactive(proxy) as T
+  return reactive(proxy) as UnwrapNestedRefs<T>
 }