fix(types): correctly infer TypeProps when it is any (#12073)

close #12058
vuejs · Oct 3, 2024 · 57315ab · 57315ab
1 parent 577edca
commit 57315ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
@@ -27,7 +27,7 @@ import type {
  EmitsToProps,
  TypeEmitsToOptions,
 } from './componentEmits'
-import { extend, isFunction } from '@vue/shared'
+import { type IsKeyValues, extend, isFunction } from '@vue/shared'
 import type { VNodeProps } from './vnode'
 import type {
  ComponentPublicInstanceConstructor,
@@ -208,15 +208,13 @@ export function defineComponent<
  ResolvedEmits extends EmitsOptions = {} extends RuntimeEmitsOptions
  ? TypeEmitsToOptions<TypeEmits>
  : RuntimeEmitsOptions,
- InferredProps = unknown extends TypeProps
- ? keyof TypeProps extends never
- ? string extends RuntimePropsKeys
- ? ComponentObjectPropsOptions extends RuntimePropsOptions
- ? {}
- : ExtractPropTypes<RuntimePropsOptions>
- : { [key in RuntimePropsKeys]?: any }
- : TypeProps
- : TypeProps,
+ InferredProps = IsKeyValues<TypeProps> extends true
+ ? TypeProps
+ : string extends RuntimePropsKeys
+ ? ComponentObjectPropsOptions extends RuntimePropsOptions
+ ? {}
+ : ExtractPropTypes<RuntimePropsOptions>
+ : { [key in RuntimePropsKeys]?: any },
  TypeRefs extends Record<string, unknown> = {},
  TypeEl extends Element = any,
 >(

diff --git a/packages/shared/src/typeUtils.ts b/packages/shared/src/typeUtils.ts
@@ -13,6 +13,12 @@ export type LooseRequired<T> = { [P in keyof (T & Required<T>)]: T[P] }
 // https://stackoverflow.com/questions/49927523/disallow-call-with-any/49928360#49928360
 export type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N
 
+export type IsKeyValues<T, K = string> = IfAny<
+ T,
+ false,
+ T extends object ? (keyof T extends K ? true : false) : false
+>
+
 /**
  * Utility for extracting the parameters from a function overload (for typed emits)
  * https://github.com/microsoft/TypeScript/issues/32164#issuecomment-1146737709