fix(types): infer the first generic type of Ref correctly (#12094)

vuejs · Oct 3, 2024 · c97bb84 · c97bb84
1 parent 57315ab
commit c97bb84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts
@@ -167,7 +167,7 @@ export type DeepReadonly<T> = T extends Builtin
  ? WeakSet<DeepReadonly<U>>
  : T extends Promise<infer U>
  ? Promise<DeepReadonly<U>>
- : T extends Ref<infer U>
+ : T extends Ref<infer U, unknown>
  ? Readonly<Ref<DeepReadonly<U>>>
  : T extends {}
  ? { readonly [K in keyof T]: DeepReadonly<T[K]> }

diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts
@@ -489,12 +489,12 @@ export type ShallowUnwrapRef<T> = {
  [K in keyof T]: DistributeRef<T[K]>
 }
 
-type DistributeRef<T> = T extends Ref<infer V> ? V : T
+type DistributeRef<T> = T extends Ref<infer V, unknown> ? V : T
 
 export type UnwrapRef<T> =
- T extends ShallowRef<infer V, infer _>
+ T extends ShallowRef<infer V, unknown>
  ? V
- : T extends Ref<infer V, infer _>
+ : T extends Ref<infer V, unknown>
  ? UnwrapRefSimple<V>
  : UnwrapRefSimple<T>