fix(types): retain union type narrowing in PropsWithDefaults with defaults applied

Author: edison1105

packages-private/dts-test/setupHelpers.test-d.ts

@@ -58,6 +58,9 @@ describe('defineProps w/ type declaration + withDefaults', <T extends
       bool?: boolean
       boolAndUndefined: boolean | undefined
       foo?: T
+      u:
+        | { type: 'button'; buttonType?: 'submit' }
+        | { type: 'link'; href: string }
     }>(),
     {
       number: 123,
@@ -88,6 +91,13 @@ describe('defineProps w/ type declaration + withDefaults', <T extends
 
   expectType<boolean>(res.bool)
   expectType<boolean>(res.boolAndUndefined)
+
+  if (res.u.type === 'button') {
+    expectType<'submit' | undefined>(res.u.buttonType)
+  }
+  if (res.u.type === 'link') {
+    expectType<string>(res.u.href)
+  }
 })
 
 describe('defineProps w/ union type declaration + withDefaults', () => {

packages/runtime-core/src/apiSetupHelpers.ts

@@ -331,21 +331,23 @@ type PropsWithDefaults<
   T,
   Defaults extends InferDefaults<T>,
   BKeys extends keyof T,
-> = Readonly<MappedOmit<T, keyof Defaults>> & {
-  readonly [K in keyof Defaults as K extends keyof T
-    ? K
-    : never]-?: K extends keyof T
-    ? Defaults[K] extends undefined
-      ? IfAny<Defaults[K], NotUndefined<T[K]>, T[K]>
-      : NotUndefined<T[K]>
-    : never
-} & {
-  readonly [K in BKeys]-?: K extends keyof Defaults
-    ? Defaults[K] extends undefined
-      ? boolean | undefined
-      : boolean
-    : boolean
-}
+> = T extends unknown
+  ? Readonly<MappedOmit<T, keyof Defaults>> & {
+      readonly [K in keyof Defaults as K extends keyof T
+        ? K
+        : never]-?: K extends keyof T
+        ? Defaults[K] extends undefined
+          ? IfAny<Defaults[K], NotUndefined<T[K]>, T[K]>
+          : NotUndefined<T[K]>
+        : never
+    } & {
+      readonly [K in BKeys]-?: K extends keyof Defaults
+        ? Defaults[K] extends undefined
+          ? boolean | undefined
+          : boolean
+        : boolean
+    }
+  : never
 
 /**
  * Vue `<script setup>` compiler macro for providing props default values when