fix(reactivity): ensure unref correctly resolves type for ShallowRef (#11360)

jh-leong · web-flow · commit a509e30f059f · 2024-07-17T10:09:57.000+08:00
close #11356
diff --git a/packages/dts-test/ref.test-d.ts b/packages/dts-test/ref.test-d.ts
@@ -452,3 +452,7 @@ describe('toRef <-> toValue', () => {
     ),
   )
 })
+
+// unref
+declare const text: ShallowRef<string> | ComputedRef<string> | MaybeRef<string>
+expectType<string>(unref(text))
diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts
@@ -235,7 +235,7 @@ export type MaybeRefOrGetter<T = any> = MaybeRef<T> | (() => T)
  * @param ref - Ref or plain value to be converted into the plain value.
  * @see {@link https://vuejs.org/api/reactivity-utilities.html#unref}
  */
-export function unref<T>(ref: MaybeRef<T> | ComputedRef<T>): T {
+export function unref<T>(ref: MaybeRef<T> | ComputedRef<T> | ShallowRef<T>): T {
   return isRef(ref) ? ref.value : ref
 }
 
@@ -255,7 +255,9 @@ export function unref<T>(ref: MaybeRef<T> | ComputedRef<T>): T {
  * @param source - A getter, an existing ref, or a non-function value.
  * @see {@link https://vuejs.org/api/reactivity-utilities.html#tovalue}
  */
-export function toValue<T>(source: MaybeRefOrGetter<T> | ComputedRef<T>): T {
+export function toValue<T>(
+  source: MaybeRefOrGetter<T> | ComputedRef<T> | ShallowRef<T>,
+): T {
   return isFunction(source) ? source() : unref(source)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -452,3 +452,7 @@ describe('toRef <-> toValue', () => {`
`452`	`452`	`),`
`453`	`453`	`)`
`454`	`454`	`})`
	`455`	`+`
	`456`	`+// unref`
	`457`	`+declare const text: ShallowRef<string> \| ComputedRef<string> \| MaybeRef<string>`
	`458`	`+expectType<string>(unref(text))`