From c17384b834e5ea390a4c19d47fb97770ac7eb7fa Mon Sep 17 00:00:00 2001
From: Ivan Hofer <ivan.hofer@outlook.com>
Date: Fri, 4 Feb 2022 17:04:39 +0100
Subject: [PATCH] improve types for `createEventDispatcher`

---
 src/runtime/internal/lifecycle.ts | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/runtime/internal/lifecycle.ts b/src/runtime/internal/lifecycle.ts
index bb3df3d29526..b188111ba28b 100644
--- a/src/runtime/internal/lifecycle.ts
+++ b/src/runtime/internal/lifecycle.ts
@@ -27,12 +27,29 @@ export function onDestroy(fn: () => any) {
 	get_current_component().$$.on_destroy.push(fn);
 }
 
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void
+	? I
+	: never
+
+type ExtractObjectValues<Object extends Record<any, any>> = Object[keyof Object]
+
+type ConstructDispatchFunction<EventMap extends Record<string, any>, EventKey extends keyof EventMap> =
+	EventMap[EventKey] extends never
+	? (type: EventKey) => void
+	: (type: EventKey, detail: EventMap[EventKey]) => void
+
+type CreateDispatchFunctionMap<EventMap> = {
+	[Key in keyof EventMap]: ConstructDispatchFunction<EventMap, Key>
+}
+
+type EventDispatcher<EventMap extends Record<string, any>> = UnionToIntersection<ExtractObjectValues<CreateDispatchFunctionMap<EventMap>>>
+
 export function createEventDispatcher<
-	EventMap extends {} = any
->(): <EventKey extends Extract<keyof EventMap, string>>(type: EventKey, detail?: EventMap[EventKey]) => void {
+	EventMap extends Record<string, any> = any
+>(): EventDispatcher<EventMap> {
 	const component = get_current_component();
 
-	return (type: string, detail?: any) => {
+	return ((type: string, detail?: any) => {
 		const callbacks = component.$$.callbacks[type];
 
 		if (callbacks) {
@@ -43,7 +60,7 @@ export function createEventDispatcher<
 				fn.call(component, event);
 			});
 		}
-	};
+	}) as EventDispatcher<EventMap>;
 }
 
 export function setContext<T>(key, context: T) {
@@ -59,7 +76,7 @@ export function getAllContexts<T extends Map<any, any> = Map<any, any>>(): T {
 }
 
 export function hasContext(key): boolean {
-	return get_current_component().$$.context.has(key);	
+	return get_current_component().$$.context.has(key);
 }
 
 // TODO figure out if we still want to support