fix(runtime-core) improve the type inference using withDefaults(vuejs…

…#6552)
littleboarx · Sep 28, 2022 · 1e53810 · 1e53810
1 parent 96cd924
commit 1e53810
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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', () => {