From d7f6a5875346706cc2ef211e3cf1e084fc4fd544 Mon Sep 17 00:00:00 2001
From: Ryan Gossiaux <ryan.gossiaux@gmail.com>
Date: Wed, 9 Feb 2022 15:44:38 -0800
Subject: [PATCH] Add default as prop type for when as= is not provided

---
 src/lib/components/dialog/Dialog.svelte       |  2 +-
 .../components/dialog/DialogOverlay.svelte    |  2 +-
 src/lib/components/dialog/DialogTitle.svelte  |  2 +-
 .../components/disclosure/Disclosure.svelte   |  2 +-
 .../disclosure/DisclosureButton.svelte        |  2 +-
 .../disclosure/DisclosurePanel.svelte         |  2 +-
 src/lib/components/listbox/Listbox.svelte     |  2 +-
 .../components/listbox/ListboxButton.svelte   |  2 +-
 .../components/listbox/ListboxLabel.svelte    |  2 +-
 .../components/listbox/ListboxOption.svelte   |  2 +-
 .../components/listbox/ListboxOptions.svelte  |  2 +-
 src/lib/components/menu/Menu.svelte           |  2 +-
 src/lib/components/menu/MenuButton.svelte     |  2 +-
 src/lib/components/menu/MenuItem.svelte       |  2 +-
 src/lib/components/menu/MenuItems.svelte      |  2 +-
 src/lib/components/popover/Popover.svelte     |  2 +-
 .../components/popover/PopoverButton.svelte   |  2 +-
 .../components/popover/PopoverGroup.svelte    |  2 +-
 .../components/popover/PopoverOverlay.svelte  |  2 +-
 .../components/popover/PopoverPanel.svelte    |  2 +-
 .../components/radio-group/RadioGroup.svelte  |  2 +-
 .../radio-group/RadioGroupOption.svelte       |  2 +-
 src/lib/components/switch/Switch.svelte       |  2 +-
 src/lib/components/switch/SwitchGroup.svelte  |  2 +-
 src/lib/components/tabs/Tab.svelte            |  2 +-
 src/lib/components/tabs/TabGroup.svelte       |  2 +-
 src/lib/components/tabs/TabList.svelte        |  2 +-
 src/lib/components/tabs/TabPanel.svelte       |  2 +-
 src/lib/components/tabs/TabPanels.svelte      |  2 +-
 .../transitions/TransitionChild.svelte        | 28 ++++++++++---------
 .../transitions/TransitionChildWrapper.svelte |  2 +-
 .../transitions/TransitionRoot.svelte         | 14 ++++++----
 src/lib/utils/Render.svelte                   | 15 ++++++----
 33 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/src/lib/components/dialog/Dialog.svelte b/src/lib/components/dialog/Dialog.svelte
index b4f5ecd..b740a8e 100644
--- a/src/lib/components/dialog/Dialog.svelte
+++ b/src/lib/components/dialog/Dialog.svelte
@@ -41,7 +41,7 @@
   type TDialogProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {
     open?: boolean;
     initialFocus?: HTMLElement | null;
     static?: boolean;
diff --git a/src/lib/components/dialog/DialogOverlay.svelte b/src/lib/components/dialog/DialogOverlay.svelte
index 4374b23..9a60665 100644
--- a/src/lib/components/dialog/DialogOverlay.svelte
+++ b/src/lib/components/dialog/DialogOverlay.svelte
@@ -2,7 +2,7 @@
   type TDialogOverlayProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/dialog/DialogTitle.svelte b/src/lib/components/dialog/DialogTitle.svelte
index f39a14b..af6965b 100644
--- a/src/lib/components/dialog/DialogTitle.svelte
+++ b/src/lib/components/dialog/DialogTitle.svelte
@@ -2,7 +2,7 @@
   type TDialogTitleProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "h2"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/disclosure/Disclosure.svelte b/src/lib/components/disclosure/Disclosure.svelte
index b681cad..5f10e5b 100644
--- a/src/lib/components/disclosure/Disclosure.svelte
+++ b/src/lib/components/disclosure/Disclosure.svelte
@@ -44,7 +44,7 @@
   type TDisclosureProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {
     defaultOpen?: boolean;
   };
 </script>
diff --git a/src/lib/components/disclosure/DisclosureButton.svelte b/src/lib/components/disclosure/DisclosureButton.svelte
index 848d0ab..64683d0 100644
--- a/src/lib/components/disclosure/DisclosureButton.svelte
+++ b/src/lib/components/disclosure/DisclosureButton.svelte
@@ -2,7 +2,7 @@
   type TDisclosureButtonProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "button"> & {
     disabled?: boolean;
   };
 </script>
diff --git a/src/lib/components/disclosure/DisclosurePanel.svelte b/src/lib/components/disclosure/DisclosurePanel.svelte
index 07beaa9..fec4e42 100644
--- a/src/lib/components/disclosure/DisclosurePanel.svelte
+++ b/src/lib/components/disclosure/DisclosurePanel.svelte
@@ -8,7 +8,7 @@
   type TDisclosurePanelProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {
     unmount?: boolean;
     static?: boolean;
   };
diff --git a/src/lib/components/listbox/Listbox.svelte b/src/lib/components/listbox/Listbox.svelte
index be192e4..f1770cf 100644
--- a/src/lib/components/listbox/Listbox.svelte
+++ b/src/lib/components/listbox/Listbox.svelte
@@ -53,7 +53,7 @@
   type TListboxProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {
     disabled?: boolean;
     horizontal?: boolean;
     value?: StateDefinition["value"];
diff --git a/src/lib/components/listbox/ListboxButton.svelte b/src/lib/components/listbox/ListboxButton.svelte
index cd866bf..982b159 100644
--- a/src/lib/components/listbox/ListboxButton.svelte
+++ b/src/lib/components/listbox/ListboxButton.svelte
@@ -2,7 +2,7 @@
   type TListboxButtonProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "button"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/listbox/ListboxLabel.svelte b/src/lib/components/listbox/ListboxLabel.svelte
index 6062f34..0087eac 100644
--- a/src/lib/components/listbox/ListboxLabel.svelte
+++ b/src/lib/components/listbox/ListboxLabel.svelte
@@ -2,7 +2,7 @@
   type TListboxLabelProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "label"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/listbox/ListboxOption.svelte b/src/lib/components/listbox/ListboxOption.svelte
index 06b9167..c371ced 100644
--- a/src/lib/components/listbox/ListboxOption.svelte
+++ b/src/lib/components/listbox/ListboxOption.svelte
@@ -2,7 +2,7 @@
   type TListboxOptionProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "li"> & {
     value: unknown;
     disabled?: boolean;
   };
diff --git a/src/lib/components/listbox/ListboxOptions.svelte b/src/lib/components/listbox/ListboxOptions.svelte
index 06878b1..6bc1345 100644
--- a/src/lib/components/listbox/ListboxOptions.svelte
+++ b/src/lib/components/listbox/ListboxOptions.svelte
@@ -2,7 +2,7 @@
   type TListboxOptionsProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "ul"> & {
     unmount?: boolean;
     static?: boolean;
   };
diff --git a/src/lib/components/menu/Menu.svelte b/src/lib/components/menu/Menu.svelte
index 0e6f9b2..2c63fdb 100644
--- a/src/lib/components/menu/Menu.svelte
+++ b/src/lib/components/menu/Menu.svelte
@@ -57,7 +57,7 @@
   type TMenuProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/menu/MenuButton.svelte b/src/lib/components/menu/MenuButton.svelte
index e5a26ab..73799fa 100644
--- a/src/lib/components/menu/MenuButton.svelte
+++ b/src/lib/components/menu/MenuButton.svelte
@@ -2,7 +2,7 @@
   type TMenuButtonProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "button"> & {
     disabled?: boolean;
   };
 </script>
diff --git a/src/lib/components/menu/MenuItem.svelte b/src/lib/components/menu/MenuItem.svelte
index 2304396..4067a49 100644
--- a/src/lib/components/menu/MenuItem.svelte
+++ b/src/lib/components/menu/MenuItem.svelte
@@ -2,7 +2,7 @@
   type TMenuItemProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "a"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/menu/MenuItems.svelte b/src/lib/components/menu/MenuItems.svelte
index 8699e33..0373366 100644
--- a/src/lib/components/menu/MenuItems.svelte
+++ b/src/lib/components/menu/MenuItems.svelte
@@ -2,7 +2,7 @@
   type TMenuItemsProps<
     TSlotProp extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProp, TAsProp> & {
+  > = TPassThroughProps<TSlotProp, TAsProp, "div"> & {
     static?: boolean;
     unmount?: boolean;
   };
diff --git a/src/lib/components/popover/Popover.svelte b/src/lib/components/popover/Popover.svelte
index bcdfc88..01d71ae 100644
--- a/src/lib/components/popover/Popover.svelte
+++ b/src/lib/components/popover/Popover.svelte
@@ -42,7 +42,7 @@
   type TPopoverProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/popover/PopoverButton.svelte b/src/lib/components/popover/PopoverButton.svelte
index 705a002..668d3f8 100644
--- a/src/lib/components/popover/PopoverButton.svelte
+++ b/src/lib/components/popover/PopoverButton.svelte
@@ -2,7 +2,7 @@
   type TPopoverButtonProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "button"> & {
     disabled?: boolean;
   };
 </script>
diff --git a/src/lib/components/popover/PopoverGroup.svelte b/src/lib/components/popover/PopoverGroup.svelte
index 6f560dd..99f553a 100644
--- a/src/lib/components/popover/PopoverGroup.svelte
+++ b/src/lib/components/popover/PopoverGroup.svelte
@@ -14,7 +14,7 @@
   type TPopoverGroupProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/popover/PopoverOverlay.svelte b/src/lib/components/popover/PopoverOverlay.svelte
index f76dbad..521e29b 100644
--- a/src/lib/components/popover/PopoverOverlay.svelte
+++ b/src/lib/components/popover/PopoverOverlay.svelte
@@ -2,7 +2,7 @@
   type TPopoverOverlayProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/popover/PopoverPanel.svelte b/src/lib/components/popover/PopoverPanel.svelte
index 23a938e..72741f6 100644
--- a/src/lib/components/popover/PopoverPanel.svelte
+++ b/src/lib/components/popover/PopoverPanel.svelte
@@ -11,7 +11,7 @@
   type TPopoverPanelProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {
     focus?: boolean;
     static?: boolean;
     unmount?: boolean;
diff --git a/src/lib/components/radio-group/RadioGroup.svelte b/src/lib/components/radio-group/RadioGroup.svelte
index d200a1a..43f6493 100644
--- a/src/lib/components/radio-group/RadioGroup.svelte
+++ b/src/lib/components/radio-group/RadioGroup.svelte
@@ -47,7 +47,7 @@
   type TRadioGroupProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {
     value: StateDefinition["value"];
     disabled?: boolean;
   };
diff --git a/src/lib/components/radio-group/RadioGroupOption.svelte b/src/lib/components/radio-group/RadioGroupOption.svelte
index 2390070..147cf52 100644
--- a/src/lib/components/radio-group/RadioGroupOption.svelte
+++ b/src/lib/components/radio-group/RadioGroupOption.svelte
@@ -2,7 +2,7 @@
   type TRadioGroupOptionProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {
     value: unknown;
     disabled?: boolean;
   };
diff --git a/src/lib/components/switch/Switch.svelte b/src/lib/components/switch/Switch.svelte
index cea3373..9200f13 100644
--- a/src/lib/components/switch/Switch.svelte
+++ b/src/lib/components/switch/Switch.svelte
@@ -2,7 +2,7 @@
   type TSwitchProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "button"> & {
     checked: boolean;
   };
 </script>
diff --git a/src/lib/components/switch/SwitchGroup.svelte b/src/lib/components/switch/SwitchGroup.svelte
index cc94625..0c6fb16 100644
--- a/src/lib/components/switch/SwitchGroup.svelte
+++ b/src/lib/components/switch/SwitchGroup.svelte
@@ -11,7 +11,7 @@
   type TSwitchGroupProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/tabs/Tab.svelte b/src/lib/components/tabs/Tab.svelte
index 59fc92d..e00399c 100644
--- a/src/lib/components/tabs/Tab.svelte
+++ b/src/lib/components/tabs/Tab.svelte
@@ -2,7 +2,7 @@
   type TTabProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "button"> & {
     disabled?: boolean;
   };
 </script>
diff --git a/src/lib/components/tabs/TabGroup.svelte b/src/lib/components/tabs/TabGroup.svelte
index 22a4394..7d142a9 100644
--- a/src/lib/components/tabs/TabGroup.svelte
+++ b/src/lib/components/tabs/TabGroup.svelte
@@ -40,7 +40,7 @@
   type TTabGroupProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {
     defaultIndex?: number;
     vertical?: boolean;
     manual?: boolean;
diff --git a/src/lib/components/tabs/TabList.svelte b/src/lib/components/tabs/TabList.svelte
index aa6fefb..dddd740 100644
--- a/src/lib/components/tabs/TabList.svelte
+++ b/src/lib/components/tabs/TabList.svelte
@@ -2,7 +2,7 @@
   type TTabListProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/tabs/TabPanel.svelte b/src/lib/components/tabs/TabPanel.svelte
index 4258cdb..7e44471 100644
--- a/src/lib/components/tabs/TabPanel.svelte
+++ b/src/lib/components/tabs/TabPanel.svelte
@@ -2,7 +2,7 @@
   type TTabPanelProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/tabs/TabPanels.svelte b/src/lib/components/tabs/TabPanels.svelte
index a8dec37..2bb1837 100644
--- a/src/lib/components/tabs/TabPanels.svelte
+++ b/src/lib/components/tabs/TabPanels.svelte
@@ -2,7 +2,7 @@
   type TTabPanelsProps<
     TSlotProps extends {},
     TAsProp extends SupportedAs
-  > = TPassThroughProps<TSlotProps, TAsProp> & {};
+  > = TPassThroughProps<TSlotProps, TAsProp, "div"> & {};
 </script>
 
 <script lang="ts">
diff --git a/src/lib/components/transitions/TransitionChild.svelte b/src/lib/components/transitions/TransitionChild.svelte
index ec0ae03..5e6e4b7 100644
--- a/src/lib/components/transitions/TransitionChild.svelte
+++ b/src/lib/components/transitions/TransitionChild.svelte
@@ -1,16 +1,18 @@
 <script lang="ts" context="module">
-  export type TTransitionChildProps<TAsProp extends SupportedAs> =
-    TPassThroughProps<{}, TAsProp> & {
-      enter?: string;
-      enterFrom?: string;
-      enterTo?: string;
-      entered?: string;
-      leave?: string;
-      leaveFrom?: string;
-      leaveTo?: string;
-      unmount?: boolean;
-      class?: string;
-    };
+  export type TTransitionChildProps<
+    TAsProp extends SupportedAs,
+    TDefaultAs
+  > = TPassThroughProps<{}, TAsProp, TDefaultAs> & {
+    enter?: string;
+    enterFrom?: string;
+    enterTo?: string;
+    entered?: string;
+    leave?: string;
+    leaveFrom?: string;
+    leaveTo?: string;
+    unmount?: boolean;
+    class?: string;
+  };
 </script>
 
 <script lang="ts">
@@ -41,7 +43,7 @@
 
   /***** Props *****/
   type TAsProp = $$Generic<SupportedAs>;
-  type $$Props = TTransitionChildProps<TAsProp>;
+  type $$Props = TTransitionChildProps<TAsProp, "div">;
 
   export let as: SupportedAs = "div";
   export let use: HTMLActionArray = [];
diff --git a/src/lib/components/transitions/TransitionChildWrapper.svelte b/src/lib/components/transitions/TransitionChildWrapper.svelte
index 760b4b8..99f3297 100644
--- a/src/lib/components/transitions/TransitionChildWrapper.svelte
+++ b/src/lib/components/transitions/TransitionChildWrapper.svelte
@@ -19,7 +19,7 @@
   /***** Props *****/
 
   type TAsProp = $$Generic<SupportedAs>;
-  type $$Props = TTransitionRootProps<TAsProp>;
+  type $$Props = TTransitionRootProps<TAsProp, "div">;
 
   export let as: SupportedAs = "div";
   export let use: HTMLActionArray = [];
diff --git a/src/lib/components/transitions/TransitionRoot.svelte b/src/lib/components/transitions/TransitionRoot.svelte
index b0b8f65..c753534 100644
--- a/src/lib/components/transitions/TransitionRoot.svelte
+++ b/src/lib/components/transitions/TransitionRoot.svelte
@@ -1,9 +1,11 @@
 <script lang="ts" context="module">
-  export type TTransitionRootProps<TAsProp extends SupportedAs> =
-    TTransitionChildProps<TAsProp> & {
-      show?: boolean;
-      appear?: boolean;
-    };
+  export type TTransitionRootProps<
+    TAsProp extends SupportedAs,
+    TDefaultAs
+  > = TTransitionChildProps<TAsProp, TDefaultAs> & {
+    show?: boolean;
+    appear?: boolean;
+  };
 </script>
 
 <script lang="ts">
@@ -38,7 +40,7 @@
 
   /***** Props *****/
   type TAsProp = $$Generic<SupportedAs>;
-  type $$Props = TTransitionRootProps<TAsProp>;
+  type $$Props = TTransitionRootProps<TAsProp, "div">;
 
   export let as: SupportedAs = "div";
   export let use: HTMLActionArray = [];
diff --git a/src/lib/utils/Render.svelte b/src/lib/utils/Render.svelte
index a30984a..c60e3e0 100644
--- a/src/lib/utils/Render.svelte
+++ b/src/lib/utils/Render.svelte
@@ -35,10 +35,14 @@
       >
     : {};
 
+  type TResolveAs<TAsProp, TDefaultAs> = SupportedAs extends TAsProp
+    ? TDefaultAs
+    : TAsProp;
   type TRenderProps<
     TSlotProps extends {},
-    TAsProp extends SupportedAs
-  > = TRestProps<TAsProp> & {
+    TAsProp extends SupportedAs,
+    TDefaultAs
+  > = TRestProps<TResolveAs<TAsProp, TDefaultAs>> & {
     name: string;
     as: TAsProp;
     slotProps: TSlotProps;
@@ -56,9 +60,10 @@
 
   export type TPassThroughProps<
     TSlotProps extends {},
-    TAsProp extends SupportedAs
+    TAsProp extends SupportedAs,
+    TDefaultAs
   > = Omit<
-    TRenderProps<TSlotProps, TAsProp>,
+    TRenderProps<TSlotProps, TAsProp, TDefaultAs>,
     TInternalProps | "as" | "static" | "unmount"
   > & {
     as?: TAsProp;
@@ -72,7 +77,7 @@
 
   type TSlotProps = $$Generic<{}>;
   type TAsProp = $$Generic<SupportedAs>;
-  type $$Props = TRenderProps<TSlotProps, TAsProp>;
+  type $$Props = TRenderProps<TSlotProps, TAsProp, TAsProp>;
 
   export let name: string;
   export let as: TAsProp;