chore: test + simplify fix

yangxiuxiu1115 · Dec 26, 2023 · fa5bf44 · fa5bf44
1 parent 18b3c56
commit fa5bf44
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/packages/dts-test/ref.test-d.ts b/packages/dts-test/ref.test-d.ts
@@ -244,13 +244,19 @@ expectType<typeof r1>(p1)
 // proxyRefs: `ShallowUnwrapRef`
 const r2 = {
   a: ref(1),
+  c: computed(() => 1),
+  u: undefined,
   obj: {
     k: ref('foo')
-  }
+  },
+  union: Math.random() > 0 - 5 ? ref({ name: 'yo' }) : null
 }
 const p2 = proxyRefs(r2)
 expectType<number>(p2.a)
+expectType<number>(p2.c)
+expectType<undefined>(p2.u)
 expectType<Ref<string>>(p2.obj.k)
+expectType<{ name: string } | null>(p2.union)
 
 // toRef and toRefs
 {

diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts
@@ -476,17 +476,12 @@ type BaseTypes = string | number | boolean
  */
 export interface RefUnwrapBailTypes {}
 
-type DistrubuteRef<T> = T extends Ref<infer V>
-  ? unknown extends V
-    ? never
-    : V
-  : T
 export type ShallowUnwrapRef<T> = {
-  [K in keyof T]: T[K] extends Ref<infer V>
-    ? V // if `V` is `unknown` that means it does not extend `Ref` and is undefined
-    : DistrubuteRef<T[K]>
+  [K in keyof T]: DistrubuteRef<T[K]>
 }
 
+type DistrubuteRef<T> = T extends Ref<infer V> ? V : T
+
 export type UnwrapRef<T> = T extends ShallowRef<infer V>
   ? V
   : T extends Ref<infer V>