Fix deep expanding types causing issues

jeannemas · Apr 16, 2024 · 03163f8 · 03163f8
1 parent 4b56bb0
commit 03163f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.changeset/gold-boxes-smash.md b/.changeset/gold-boxes-smash.md
@@ -0,0 +1,5 @@
+---
+'@jeanne-mas/svelte-ui': patch
+---
+
+Fixed deep expanding types causing issues
diff --git a/src/lib/utils/types.ts b/src/lib/utils/types.ts
@@ -10,13 +10,9 @@ export type Transition = (node: Element, params?: unknown) => TransitionConfig;
 export type TransitionParams<T extends Transition> = Parameters<T>[1];
 
 /**
- * Recursively expands the type of an object.
+ * Expands the type of an object.
  */
-type ExpandDeep<T> = T extends object
-  ? T extends infer O
-    ? { [K in keyof O]: ExpandDeep<O[K]> }
-    : never
-  : T;
+type Expand<T> = T extends object ? (T extends infer O ? { [K in keyof O]: O[K] } : never) : T;
 /**
  * Fix for the following error:
  *
@@ -26,9 +22,9 @@ type ExpandDeep<T> = T extends object
  */
 type PatchSlotsWithBuilderAction<TSlots extends Record<string, Record<string, unknown>>> = {
   [TSlotName in keyof TSlots]: TSlots[TSlotName] extends { builder: infer TBuilder }
-    ? ExpandDeep<Omit<TSlots[TSlotName], 'builder'>> & {
+    ? Expand<Omit<TSlots[TSlotName], 'builder'>> & {
         builder: TBuilder extends { action: Action }
-          ? ExpandDeep<Omit<TBuilder, 'action'>> & {
+          ? Expand<Omit<TBuilder, 'action'>> & {
               action: Action;
             }
           : TBuilder;