From f5af09f4754858e1c8f80685ac1d8cb105e9b732 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Sat, 12 Nov 2022 16:15:26 +0800
Subject: [PATCH 1/8] fix(runtime-core): return boolean type when use
 `defineProps` to set optional boolean prop

---
 packages/runtime-core/src/apiSetupHelpers.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 0ab3d252d55..1df55bfc440 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -58,7 +58,19 @@ export function defineProps<
   PP extends ComponentObjectPropsOptions = ComponentObjectPropsOptions
 >(props: PP): Readonly<ExtractPropTypes<PP>>
 // overload 3: typed-based declaration
-export function defineProps<TypeProps>(): Readonly<TypeProps>
+// The Boolean absent props will be cast to false, so the return type
+// must be a boolean type
+export function defineProps<TypeProps>(): Readonly<
+  {
+    [K in keyof TypeProps as TypeProps[K] extends boolean | undefined
+      ? K
+      : never]-?: TypeProps[K]
+  } & {
+    [K in keyof TypeProps as TypeProps[K] extends boolean | undefined
+      ? never
+      : K]: TypeProps[K]
+  }
+>
 // implementation
 export function defineProps() {
   if (__DEV__) {

From 859abae91e3969e6a32115f5bca76334414c4a4c Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Sat, 12 Nov 2022 17:32:34 +0800
Subject: [PATCH 2/8] ci rebuild


From 054f71d62588cab2d0ae9c58d6db064f2f032945 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Sat, 12 Nov 2022 17:36:17 +0800
Subject: [PATCH 3/8] ci rebuild


From 151cc562e73618c78ea25f2f1af5834c2cde6495 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Sat, 12 Nov 2022 19:10:31 +0800
Subject: [PATCH 4/8] fix(runtime-core):  add the judgment of default value by
 `withDefaults`

---
 packages/runtime-core/src/apiSetupHelpers.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 1df55bfc440..9db0d790db6 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -154,12 +154,18 @@ 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
+type PropsWithDefaults<Base, Defaults> = {
+  [K in keyof Base as K extends keyof Defaults
     ? Defaults[K] extends undefined
-      ? Base[K]
-      : NotUndefined<Base[K]>
-    : never
+      ? never
+      : K
+    : K]: Base[K]
+} & {
+  [K in keyof Base as K extends keyof Defaults
+    ? Defaults[K] extends undefined
+      ? K
+      : never
+    : never]?: Base[K] | undefined
 }
 
 /**

From df5656feb88d738e3fd16e8a0a40ec56142542c5 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Sat, 12 Nov 2022 19:43:18 +0800
Subject: [PATCH 5/8] fix(runtime-core): fix defaults error

---
 packages/runtime-core/src/apiSetupHelpers.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 9db0d790db6..d0f7c3e5c65 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -58,7 +58,7 @@ export function defineProps<
   PP extends ComponentObjectPropsOptions = ComponentObjectPropsOptions
 >(props: PP): Readonly<ExtractPropTypes<PP>>
 // overload 3: typed-based declaration
-// The Boolean absent props will be cast to false, so the return type
+// the Boolean absent props will be cast to false, so the return type
 // must be a boolean type
 export function defineProps<TypeProps>(): Readonly<
   {
@@ -159,14 +159,22 @@ type PropsWithDefaults<Base, Defaults> = {
     ? Defaults[K] extends undefined
       ? never
       : K
-    : K]: Base[K]
+    : K]: Base[K];
 } & {
   [K in keyof Base as K extends keyof Defaults
     ? Defaults[K] extends undefined
       ? K
       : never
-    : never]?: Base[K] | undefined
-}
+    : never]?: Base[K] | undefined;
+} & Readonly<{
+  [K in keyof Defaults as Defaults[K] extends undefined
+    ? never
+    : K]: K extends keyof Base
+    ? Defaults[K] extends undefined
+      ? Base[K]
+      : NotUndefined<Base[K]>
+    : never;
+}>
 
 /**
  * Vue `<script setup>` compiler macro for providing props default values when

From 26311329dcaa8a4716faadf3785ff3129d345420 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Sat, 12 Nov 2022 19:45:40 +0800
Subject: [PATCH 6/8] test: add tests

---
 test-dts/setupHelpers.test-d.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test-dts/setupHelpers.test-d.ts b/test-dts/setupHelpers.test-d.ts
index d099d37441d..10739f93376 100644
--- a/test-dts/setupHelpers.test-d.ts
+++ b/test-dts/setupHelpers.test-d.ts
@@ -13,9 +13,12 @@ describe('defineProps w/ type declaration', () => {
   // type declaration
   const props = defineProps<{
     foo: string
+    bool?: boolean
   }>()
   // explicitly declared type should be refined
   expectType<string>(props.foo)
+  // the Boolean absent props will be cast to false
+  expectType<boolean>(props.bool)
   // @ts-expect-error
   props.bar
 })
@@ -23,6 +26,7 @@ describe('defineProps w/ type declaration', () => {
 describe('defineProps w/ type declaration + withDefaults', () => {
   const res = withDefaults(
     defineProps<{
+      bool?: boolean
       number?: number
       arr?: string[]
       obj?: { x: number }
@@ -33,6 +37,7 @@ describe('defineProps w/ type declaration + withDefaults', () => {
       z?: string
     }>(),
     {
+      bool: undefined,
       number: 123,
       arr: () => [],
       obj: () => ({ x: 123 }),
@@ -53,6 +58,7 @@ describe('defineProps w/ type declaration + withDefaults', () => {
   // @ts-expect-error
   res.y.slice()
 
+  expectType<boolean | undefined>(res.bool)
   expectType<string | undefined>(res.x)
   expectType<string | undefined>(res.y)
   expectType<string>(res.z)
@@ -70,7 +76,7 @@ describe('defineProps w/ union type declaration + withDefaults', () => {
       union1: 123,
       union2: () => [123],
       union3: () => ({ x: 123 }),
-      union4: () => 123,
+      union4: () => 123
     }
   )
 })

From 8c750a9f7febf49ece819c56d977331385436bcd Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Tue, 15 Nov 2022 17:18:30 +0800
Subject: [PATCH 7/8] chore: ci rebuild


From 9a9cbdd3d10c0dc9338a743842d24c17c7521ec4 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Thu, 12 Jan 2023 14:01:52 +0800
Subject: [PATCH 8/8] fix(runtime-core): add boolAndUndefined conversion

---
 packages/runtime-core/src/apiSetupHelpers.ts | 2 +-
 test-dts/setupHelpers.test-d.ts              | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index d0f7c3e5c65..e5784010f11 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -64,7 +64,7 @@ export function defineProps<TypeProps>(): Readonly<
   {
     [K in keyof TypeProps as TypeProps[K] extends boolean | undefined
       ? K
-      : never]-?: TypeProps[K]
+      : never]-?: NotUndefined<TypeProps[K]>
   } & {
     [K in keyof TypeProps as TypeProps[K] extends boolean | undefined
       ? never
diff --git a/test-dts/setupHelpers.test-d.ts b/test-dts/setupHelpers.test-d.ts
index 10739f93376..1473c214d20 100644
--- a/test-dts/setupHelpers.test-d.ts
+++ b/test-dts/setupHelpers.test-d.ts
@@ -14,11 +14,13 @@ describe('defineProps w/ type declaration', () => {
   const props = defineProps<{
     foo: string
     bool?: boolean
+    boolAndUndefined: boolean | undefined
   }>()
   // explicitly declared type should be refined
   expectType<string>(props.foo)
   // the Boolean absent props will be cast to false
   expectType<boolean>(props.bool)
+  expectType<boolean>(props.boolAndUndefined)
   // @ts-expect-error
   props.bar
 })
@@ -27,6 +29,7 @@ describe('defineProps w/ type declaration + withDefaults', () => {
   const res = withDefaults(
     defineProps<{
       bool?: boolean
+      boolAndUndefined: boolean | undefined
       number?: number
       arr?: string[]
       obj?: { x: number }
@@ -59,6 +62,7 @@ describe('defineProps w/ type declaration + withDefaults', () => {
   res.y.slice()
 
   expectType<boolean | undefined>(res.bool)
+  expectType<boolean | undefined>(res.boolAndUndefined)
   expectType<string | undefined>(res.x)
   expectType<string | undefined>(res.y)
   expectType<string>(res.z)