From bf33397855095411d2759a0ffc251769866b0d97 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Thu, 8 Apr 2021 17:07:02 +0200
Subject: [PATCH] Give clearer type names to dynamicComponent

---
 ts/sveltelib/dynamicComponent.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ts/sveltelib/dynamicComponent.ts b/ts/sveltelib/dynamicComponent.ts
index 743f122aa..90f21a277 100644
--- a/ts/sveltelib/dynamicComponent.ts
+++ b/ts/sveltelib/dynamicComponent.ts
@@ -6,22 +6,22 @@ export interface DynamicSvelteComponent<
     component: T;
 }
 
-export const dynamicComponent = <T extends typeof SvelteComponentDev>(component: T) => <
-    U extends NonNullable<ConstructorParameters<T>[0]["props"]>,
-    V extends string = never
+export const dynamicComponent = <Comp extends typeof SvelteComponentDev>(component: Comp) => <
+    Props extends NonNullable<ConstructorParameters<Comp>[0]["props"]>,
+    Lazy extends string = never
 >(
-    props: Omit<U, V>,
-    lazyProps: { [Property in keyof Pick<U, V>]: () => Pick<U, V>[Property] }
-): DynamicSvelteComponent<T> & U => {
+    props: Omit<Props, Lazy>,
+    lazyProps: { [Property in keyof Pick<Props, Lazy>]: () => Pick<Props, Lazy>[Property] }
+): DynamicSvelteComponent<Comp> & Props => {
     const dynamicComponent = { component, ...props };
 
     for (const property in lazyProps) {
         const get = lazyProps[property];
         const propertyDescriptor: TypedPropertyDescriptor<
-            Pick<U, V>[Extract<keyof Pick<U, V>, string>]
+            Pick<Props, Lazy>[Extract<keyof Pick<Props, Lazy>, string>]
         > = { get, enumerable: true };
         Object.defineProperty(dynamicComponent, property, propertyDescriptor);
     }
 
-    return dynamicComponent as DynamicSvelteComponent<T> & U;
+    return dynamicComponent as DynamicSvelteComponent<Comp> & Props;
 };