From 1e538100d9556fdbf73323469fd78d08a3cd7d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=8C=E9=9D=A2=E8=83=B6?= <shuangmianjiao@xinyoudi.com>
Date: Wed, 28 Sep 2022 11:28:02 +0800
Subject: [PATCH] fix(runtime-core) improve the type inference using
 withDefaults(#6552)

---
 packages/runtime-core/src/apiSetupHelpers.ts | 6 +++---
 test-dts/setupHelpers.test-d.ts              | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index a8b7fcdef31..ab2151a1272 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -142,9 +142,9 @@ type InferDefault<P, T> = T extends
   ? T | ((props: P) => T)
   : (props: P) => T
 
-type PropsWithDefaults<Base, Defaults> = Base & {
-  [K in keyof Defaults]: K extends keyof Base ? NotUndefined<Base[K]> : never
-}
+type PropsWithDefaults<Base, Defaults> = Base & ({
+  [K in keyof Defaults]: K extends keyof Base ?Defaults[K]& NotUndefined<Base[K]>  : never
+})
 
 /**
  * Vue `<script setup>` compiler macro for providing props default values when
diff --git a/test-dts/setupHelpers.test-d.ts b/test-dts/setupHelpers.test-d.ts
index 6b9c67b2897..176aec8412c 100644
--- a/test-dts/setupHelpers.test-d.ts
+++ b/test-dts/setupHelpers.test-d.ts
@@ -29,13 +29,15 @@ describe('defineProps w/ type declaration + withDefaults', () => {
       fn?: (e: string) => void
       x?: string
       genStr?: string
+      y?: string
     }>(),
     {
       number: 123,
       arr: () => [],
       obj: () => ({ x: 123 }),
       fn: () => {},
-      genStr: () => ''
+      genStr: () => '',
+      y:undefined
     }
   )
 
@@ -46,6 +48,8 @@ describe('defineProps w/ type declaration + withDefaults', () => {
   // @ts-expect-error
   res.x.slice()
   res.genStr.slice()
+  // @ts-expect-error
+  res.y.split('')
 })
 
 describe('defineProps w/ union type declaration + withDefaults', () => {