From 91e54dbc41f902c61581ca88222f8164e68a17a0 Mon Sep 17 00:00:00 2001
From: David Matter <david.matter@me.com>
Date: Mon, 16 Oct 2023 18:19:21 +0200
Subject: [PATCH 1/3] fix(types): Use alternative Omit

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

diff --git a/packages/dts-test/setupHelpers.test-d.ts b/packages/dts-test/setupHelpers.test-d.ts
index feb4085dea0..45a90ed6bca 100644
--- a/packages/dts-test/setupHelpers.test-d.ts
+++ b/packages/dts-test/setupHelpers.test-d.ts
@@ -100,6 +100,31 @@ describe('defineProps w/ union type declaration + withDefaults', () => {
   )
 })
 
+describe('defineProps w/ generic discriminate union + withDefaults', () => {
+  interface B {
+    b?: string
+  }
+  interface S<T> extends B {
+    mode: 'single'
+    v: T
+  }
+  interface M<T> extends B {
+    mode: 'multiple'
+    v: T[]
+  }
+  type Props = S<string> | M<string>
+  const props = withDefaults(defineProps<Props>(), {
+    b: 'b'
+  })
+
+  if (props.mode === 'single') {
+    expectType<string>(props.v)
+  }
+  if (props.mode === 'multiple') {
+    expectType<string[]>(props.v)
+  }
+})
+
 describe('defineProps w/ generic type declaration + withDefaults', <T extends
   number, TA extends {
   a: string
diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 93200667081..8193d21a0b7 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -293,11 +293,16 @@ type InferDefault<P, T> =
   | ((props: P) => T & {})
   | (T extends NativeType ? T : never)
 
+// https://github.com/vuejs/core/issues/9335
+type OmitKeepDiscriminatedUnion<T, K extends keyof any> = T extends any
+  ? Pick<T, Exclude<keyof T, K>>
+  : never
+
 type PropsWithDefaults<
   T,
   Defaults extends InferDefaults<T>,
   BKeys extends keyof T
-> = Omit<T, keyof Defaults> & {
+> = OmitKeepDiscriminatedUnion<T, keyof Defaults> & {
   [K in keyof Defaults]-?: K extends keyof T
     ? Defaults[K] extends undefined
       ? T[K]

From 2fe82278ed878d080c11d077c4926fea20bfbb72 Mon Sep 17 00:00:00 2001
From: Evan You <evan@vuejs.org>
Date: Fri, 2 Aug 2024 11:42:50 +0800
Subject: [PATCH 2/3] Update apiSetupHelpers.ts

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

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index fcb9bc8d3b2..39d8edbcc20 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -298,11 +298,6 @@ type InferDefault<P, T> =
   | ((props: P) => T & {})
   | (T extends NativeType ? T : never)
 
-// https://github.com/vuejs/core/issues/9335
-type OmitKeepDiscriminatedUnion<T, K extends keyof any> = T extends any
-  ? Pick<T, Exclude<keyof T, K>>
-  : never
-
 type PropsWithDefaults<
   T,
   Defaults extends InferDefaults<T>,

From 0617fe87c008d1f8c5ad4d5373b37d63717c3061 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 03:43:35 +0000
Subject: [PATCH 3/3] [autofix.ci] apply automated fixes

---
 packages/dts-test/setupHelpers.test-d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dts-test/setupHelpers.test-d.ts b/packages/dts-test/setupHelpers.test-d.ts
index d6eea8e923f..729f9b97d05 100644
--- a/packages/dts-test/setupHelpers.test-d.ts
+++ b/packages/dts-test/setupHelpers.test-d.ts
@@ -151,7 +151,7 @@ describe('defineProps w/ generic discriminate union + withDefaults', () => {
   }
   type Props = S<string> | M<string>
   const props = withDefaults(defineProps<Props>(), {
-    b: 'b'
+    b: 'b',
   })
 
   if (props.mode === 'single') {