types(runtime-core): make `FunctionalComponent` with emit string[] to be `Component...

fix #1847

diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index ee9ae1be5a43fe1a41fc5b10b32030d497e4c017..cfc1a531b86c898b87808c3f0aa09f9653b52143 100644 (file)
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -110,7 +110,7 @@ export interface ClassComponent {
   __vccOpts: ComponentOptions
 }
 
-export type Component = ComponentOptions | FunctionalComponent<any>
+export type Component = ComponentOptions | FunctionalComponent<any, any>
 
 // A type used in public APIs where a component type is expected.
 // The constructor type is an artificial type returned by defineComponent().

diff --git a/test-dts/functionalComponent.test-d.tsx b/test-dts/functionalComponent.test-d.tsx
index 6783fed61c2a5f36ad2b357f8d22371800b5c24c..c53c4287a6e4046636882cb01be8bad88c669f7b 100644 (file)
--- a/test-dts/functionalComponent.test-d.tsx
+++ b/test-dts/functionalComponent.test-d.tsx
@@ -1,4 +1,9 @@
-import { FunctionalComponent, expectError, expectType } from './index'
+import {
+  FunctionalComponent,
+  expectError,
+  expectType,
+  Component
+} from './index'
 
 // simple function signature
 const Foo = (props: { foo: number }) => props.foo
@@ -51,3 +56,10 @@ expectError(<Foo />)
 expectError(<Bar foo="bar" />)
 //  @ts-expect-error
 expectError(<Foo baz="bar" />)
+
+const Baz: FunctionalComponent<{}, string[]> = (props, { emit }) => {
+  expectType<{}>(props)
+  expectType<(event: string) => void>(emit)
+}
+
+expectType<Component>(Baz)