types(defineComponent): fix unwrap when returning Ref<T>|undefined from setup (#4100)

2021-07-15 20:58:20 +01:00
parent e508ee08e9
commit f6a5f09a3a
2 changed files with 9 additions and 3 deletions
--- a/packages/reactivity/src/ref.ts
+++ b/packages/reactivity/src/ref.ts
@@ -205,7 +205,11 @@ type BaseTypes = string | number | boolean
 export interface RefUnwrapBailTypes {}

 export type ShallowUnwrapRef<T> = {
-  [K in keyof T]: T[K] extends Ref<infer V> ? V : T[K]
+  [K in keyof T]: T[K] extends Ref<infer V>
+    ? V
+    : T[K] extends Ref<infer V> | undefined // if `V` is `unknown` that means it does not extend `Ref` and is undefined
+      ? unknown extends V ? undefined : V | undefined
+      : T[K]
 }

 export type UnwrapRef<T> = T extends Ref<infer V>