fix: pass captured Setup type

Author: arnoson

src/registerComponent.ts

@@ -17,17 +17,21 @@ export const defineOptions = <Options extends SimpleComponentOptions>(
 export function registerComponent<
   Setup extends SimpleComponentSetup<Options>,
   Options extends SimpleComponentOptions = {}
->(name: string, setup: Setup): SimpleComponent<Options>
+>(name: string, setup: Setup): SimpleComponent<Options, Setup>
 
 export function registerComponent<
   Setup extends SimpleComponentSetup<Options>,
   Options extends SimpleComponentOptions = {}
->(name: string, options: Options, setup: Setup): SimpleComponent<Options>
+>(name: string, options: Options, setup: Setup): SimpleComponent<Options, Setup>
 
 export function registerComponent<
   Setup extends SimpleComponentSetup<Options>,
   Options extends SimpleComponentOptions = {}
->(name: string, arg1: Options | Setup, arg2?: Setup): SimpleComponent<Options> {
+>(
+  name: string,
+  arg1: Options | Setup,
+  arg2?: Setup
+): SimpleComponent<Options, Setup> {
   const hasBothArgs = arg2 !== undefined
   const options = (hasBothArgs ? arg1 : {}) as Options
   const setup = (hasBothArgs ? arg2 : arg1) as Setup

src/types.ts

@@ -57,12 +57,15 @@ export type SimpleComponentContext<
   ComponentEvent: SimpleComponentEvent<SimpleEventMap<Options['events']>>
 }
 
-export type SimpleComponentSetup<O extends SimpleComponentOptions> = (
-  ctx: SimpleComponentContext<O>
+export type SimpleComponentSetup<Options extends SimpleComponentOptions> = (
+  ctx: SimpleComponentContext<Options>
 ) => any
 
-export type SimpleComponent<Options extends SimpleComponentOptions = any> = {
-  setup: SimpleComponentSetup<Options>
+export type SimpleComponent<
+  Options extends SimpleComponentOptions = any,
+  Setup extends SimpleComponentSetup<Options> = any
+> = {
+  setup: Setup
   options: Options
 }
 
@@ -88,7 +91,7 @@ export interface SimpleComponentEvent<
 }
 
 export type SimpleElement<
-  Component extends SimpleComponent = SimpleComponent,
+  Component extends SimpleComponent,
   Options extends SimpleComponentOptions = Component['options'],
   Context extends SimpleComponentContext<any> = SimpleComponentContext<Options>,
   Events extends SimpleEventMap<Options['events']> = SimpleEventMap<