From 5c3db15054f836aeddb927ee006a2c25f5a01396 Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Sun, 18 Aug 2024 03:29:01 +0800
Subject: [PATCH 1/3] fix(runtime-core): correct type inference of all-optional
 props

---
 packages/runtime-core/src/apiDefineComponent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 0dde68f888c..419263c77ac 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -203,7 +203,7 @@ export function defineComponent<
   ResolvedEmits extends EmitsOptions = {} extends RuntimeEmitsOptions
     ? TypeEmitsToOptions<TypeEmits>
     : RuntimeEmitsOptions,
-  InferredProps = unknown extends TypeProps
+  InferredProps = keyof TypeProps extends never
     ? string extends RuntimePropsKeys
       ? ComponentObjectPropsOptions extends RuntimePropsOptions
         ? {}

From 37280e6b7a60112eae5fe0cf20bff23ae80c68e7 Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Sun, 18 Aug 2024 11:19:19 +0800
Subject: [PATCH 2/3] fix: runtime infer

---
 packages/runtime-core/src/componentProps.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
index 830bfbc3fcd..b626e0f26ac 100644
--- a/packages/runtime-core/src/componentProps.ts
+++ b/packages/runtime-core/src/componentProps.ts
@@ -125,7 +125,9 @@ type InferPropType<T, NullAsAny = true> = [T] extends [null]
               : InferPropType<U, false>
             : [T] extends [Prop<infer V, infer D>]
               ? unknown extends V
-                ? IfAny<V, V, D>
+                ? keyof V extends never
+                  ? IfAny<V, V, D>
+                  : V
                 : V
               : T
 

From 3ac8835c1f6bd7b890048565da1ea6f47d87c436 Mon Sep 17 00:00:00 2001
From: KazariEX <1364035137@qq.com>
Date: Sun, 18 Aug 2024 11:26:32 +0800
Subject: [PATCH 3/3] fix: keep consistency

---
 packages/runtime-core/src/apiDefineComponent.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index 419263c77ac..cf32ff1b019 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -203,12 +203,14 @@ export function defineComponent<
   ResolvedEmits extends EmitsOptions = {} extends RuntimeEmitsOptions
     ? TypeEmitsToOptions<TypeEmits>
     : RuntimeEmitsOptions,
-  InferredProps = keyof TypeProps extends never
-    ? string extends RuntimePropsKeys
-      ? ComponentObjectPropsOptions extends RuntimePropsOptions
-        ? {}
-        : ExtractPropTypes<RuntimePropsOptions>
-      : { [key in RuntimePropsKeys]?: any }
+  InferredProps = unknown extends TypeProps
+    ? keyof TypeProps extends never
+      ? string extends RuntimePropsKeys
+        ? ComponentObjectPropsOptions extends RuntimePropsOptions
+          ? {}
+          : ExtractPropTypes<RuntimePropsOptions>
+        : { [key in RuntimePropsKeys]?: any }
+      : TypeProps
     : TypeProps,
   ResolvedProps = Readonly<InferredProps & EmitsToProps<ResolvedEmits>>,
   TypeRefs extends Record<string, unknown> = {},