From cd7cc0d9a36a4ea64aebb2d0d84241ca04925891 Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Tue, 25 Jun 2024 17:58:14 +0200
Subject: [PATCH] chore: improve types export

---
 docs/app/app.vue                                    |  2 +-
 docs/app/components/Header.vue                      |  2 +-
 docs/app/error.vue                                  |  2 +-
 docs/app/pages/[...slug].vue                        |  2 +-
 package.json                                        |  5 +++--
 playground/app/components/FormElementsExample.vue   |  2 +-
 playground/app/components/FormNestedExample.vue     |  2 +-
 playground/app/components/FormNestedListExample.vue |  2 +-
 playground/app/pages/form.vue                       |  2 +-
 playground/app/pages/kbd.vue                        |  2 +-
 src/module.ts                                       |  6 ++++--
 src/runtime/components/Accordion.vue                |  2 +-
 src/runtime/components/Alert.vue                    |  2 +-
 src/runtime/components/App.vue                      |  2 +-
 src/runtime/components/Breadcrumb.vue               |  6 +++---
 src/runtime/components/Button.vue                   |  6 +++---
 src/runtime/components/CommandPalette.vue           | 10 +++++-----
 src/runtime/components/ContextMenu.vue              |  6 +++---
 src/runtime/components/ContextMenuContent.vue       |  6 +++---
 src/runtime/components/DropdownMenu.vue             |  6 +++---
 src/runtime/components/DropdownMenuContent.vue      |  6 +++---
 src/runtime/components/Form.vue                     |  6 +++---
 src/runtime/components/FormField.vue                |  2 +-
 src/runtime/components/Input.vue                    |  4 ++--
 src/runtime/components/InputMenu.vue                |  8 ++++----
 src/runtime/components/Kbd.vue                      |  2 +-
 src/runtime/components/Modal.vue                    |  2 +-
 src/runtime/components/NavigationMenu.vue           |  6 +++---
 src/runtime/components/Pagination.vue               |  2 +-
 src/runtime/components/RadioGroup.vue               |  2 +-
 src/runtime/components/Select.vue                   |  6 +++---
 src/runtime/components/SelectMenu.vue               |  8 ++++----
 src/runtime/components/Separator.vue                |  2 +-
 src/runtime/components/Slideover.vue                |  2 +-
 src/runtime/components/Tabs.vue                     |  4 ++--
 src/runtime/components/Textarea.vue                 |  2 +-
 src/runtime/components/Toast.vue                    |  2 +-
 src/runtime/components/Toaster.vue                  |  2 +-
 src/runtime/components/Tooltip.vue                  |  2 +-
 src/runtime/composables/useAvatarGroup.ts           |  2 +-
 src/runtime/composables/useButtonGroup.ts           |  2 +-
 src/runtime/composables/useFormField.ts             |  6 +++---
 src/runtime/composables/useModal.ts                 |  4 ++--
 src/runtime/composables/useSlideover.ts             |  4 ++--
 src/runtime/composables/useToast.ts                 |  2 +-
 src/runtime/types/{component.d.ts => component.ts}  |  0
 src/runtime/types/{index.d.ts => index.ts}          |  1 +
 src/runtime/types/{utils.d.ts => utils.ts}          |  0
 src/runtime/utils/form.ts                           |  2 +-
 src/runtime/utils/link.ts                           |  2 +-
 50 files changed, 87 insertions(+), 83 deletions(-)
 rename src/runtime/types/{component.d.ts => component.ts} (100%)
 rename src/runtime/types/{index.d.ts => index.ts} (98%)
 rename src/runtime/types/{utils.d.ts => utils.ts} (100%)

diff --git a/docs/app/app.vue b/docs/app/app.vue
index 0dc9784d..1e0e57ee 100644
--- a/docs/app/app.vue
+++ b/docs/app/app.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { withoutTrailingSlash } from 'ufo'
 // import { debounce } from 'perfect-debounce'
-import type { ContentSearchFile } from '#ui-pro/types'
+import type { ContentSearchFile } from '@nuxt/ui-pro'
 
 const route = useRoute()
 // const colorMode = useColorMode()
diff --git a/docs/app/components/Header.vue b/docs/app/components/Header.vue
index 075bd56a..4c8a65e6 100644
--- a/docs/app/components/Header.vue
+++ b/docs/app/components/Header.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { NavItem } from '@nuxt/content'
-import type { NavigationMenuItem } from '#ui/types'
+import type { NavigationMenuItem } from '@nuxt/ui'
 
 const props = defineProps<{
   links: NavigationMenuItem[]
diff --git a/docs/app/error.vue b/docs/app/error.vue
index 7f983ee7..bb90386c 100644
--- a/docs/app/error.vue
+++ b/docs/app/error.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { NuxtError } from '#app'
-import type { ContentSearchFile } from '#ui-pro/types'
+import type { ContentSearchFile } from '@nuxt/ui-pro'
 
 useSeoMeta({
   title: 'Page not found',
diff --git a/docs/app/pages/[...slug].vue b/docs/app/pages/[...slug].vue
index e7a4ce50..33514de8 100644
--- a/docs/app/pages/[...slug].vue
+++ b/docs/app/pages/[...slug].vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { withoutTrailingSlash } from 'ufo'
-import { findPageHeadline } from '#ui-pro/utils/content'
+import { findPageHeadline } from '@nuxt/ui-pro/runtime/utils/content'
 
 const route = useRoute()
 
diff --git a/package.json b/package.json
index c2590478..16e77bca 100644
--- a/package.json
+++ b/package.json
@@ -11,10 +11,11 @@
   "license": "MIT",
   "exports": {
     ".": {
-      "types": "./dist/types.d.ts",
+      "types": "./dist/module.d.ts",
       "import": "./dist/module.mjs",
       "require": "./dist/module.cjs"
-    }
+    },
+    "./runtime/*": "./dist/runtime/*"
   },
   "bin": {
     "nuxt-ui": "./cli/index.mjs"
diff --git a/playground/app/components/FormElementsExample.vue b/playground/app/components/FormElementsExample.vue
index d135801d..186e14af 100644
--- a/playground/app/components/FormElementsExample.vue
+++ b/playground/app/components/FormElementsExample.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { z } from 'zod'
-import type { FormSubmitEvent, Form } from '#ui/types/form'
+import type { FormSubmitEvent, Form } from '@nuxt/ui'
 
 const schema = z.object({
   input: z.string().min(10),
diff --git a/playground/app/components/FormNestedExample.vue b/playground/app/components/FormNestedExample.vue
index 8fc71b0a..a6edd428 100644
--- a/playground/app/components/FormNestedExample.vue
+++ b/playground/app/components/FormNestedExample.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { z } from 'zod'
-import type { FormSubmitEvent } from '#ui/types/form'
+import type { FormSubmitEvent } from '@nuxt/ui'
 
 const schema = z.object({
   email: z.string().min(2),
diff --git a/playground/app/components/FormNestedListExample.vue b/playground/app/components/FormNestedListExample.vue
index 4cd77cce..375f751b 100644
--- a/playground/app/components/FormNestedListExample.vue
+++ b/playground/app/components/FormNestedListExample.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { z } from 'zod'
-import type { FormSubmitEvent } from '#ui/types/form'
+import type { FormSubmitEvent } from '@nuxt/ui'
 
 const schema = z.object({
   email: z.string().min(2),
diff --git a/playground/app/pages/form.vue b/playground/app/pages/form.vue
index f483660d..4cf0987c 100644
--- a/playground/app/pages/form.vue
+++ b/playground/app/pages/form.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { z } from 'zod'
-import type { FormSubmitEvent } from '#ui/types/form'
+import type { FormSubmitEvent } from '@nuxt/ui'
 
 const schema = z.object({
   email: z.string().email(),
diff --git a/playground/app/pages/kbd.vue b/playground/app/pages/kbd.vue
index a871dec8..55834351 100644
--- a/playground/app/pages/kbd.vue
+++ b/playground/app/pages/kbd.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import theme from '#build/ui/kbd'
-import { kbdKeysMap } from '#ui/composables/useKbd'
+import { kbdKeysMap } from '@nuxt/ui/runtime/composables/useKbd.js'
 
 const sizes = Object.keys(theme.variants.size)
 const kbdKeys = Object.keys(kbdKeysMap)
diff --git a/src/module.ts b/src/module.ts
index 770d4dd9..f7825968 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -4,6 +4,8 @@ import tailwindcss from '@tailwindcss/vite'
 import { addTemplates } from './templates'
 import icons from './theme/icons'
 
+export type * from './runtime/types'
+
 export interface ModuleOptions {
   /**
    * Prefix for components
@@ -40,8 +42,7 @@ export default defineNuxtModule<ModuleOptions>({
 
     options.colors = options.colors?.length ? [...new Set(['primary', ...options.colors])] : ['primary', 'red', 'orange', 'amber', 'yellow', 'lime', 'green', 'emerald', 'teal', 'cyan', 'sky', 'blue', 'indigo', 'violet', 'purple', 'fuchia', 'pink', 'rose']
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
+    // @ts-expect-error - Add ui options to nuxt
     nuxt.options.ui = options
 
     nuxt.options.alias['#ui'] = resolve('./runtime')
@@ -54,6 +55,7 @@ export default defineNuxtModule<ModuleOptions>({
 
     // Isolate root node from portaled components
     nuxt.options.app.rootAttrs = nuxt.options.app.rootAttrs || {}
+    // TODO: Check if already set
     nuxt.options.app.rootAttrs.class = 'isolate'
 
     addVitePlugin(tailwindcss)
diff --git a/src/runtime/components/Accordion.vue b/src/runtime/components/Accordion.vue
index b773c0da..59a1e70c 100644
--- a/src/runtime/components/Accordion.vue
+++ b/src/runtime/components/Accordion.vue
@@ -4,7 +4,7 @@ import type { AccordionRootProps, AccordionRootEmits, AccordionContentProps, Acc
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/accordion'
-import type { DynamicSlots } from '#ui/types/utils'
+import type { DynamicSlots } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { accordion: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Alert.vue b/src/runtime/components/Alert.vue
index 07cb6513..2886a8d6 100644
--- a/src/runtime/components/Alert.vue
+++ b/src/runtime/components/Alert.vue
@@ -5,7 +5,7 @@ import type { PrimitiveProps } from 'radix-vue'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/alert'
-import type { AvatarProps, ButtonProps } from '#ui/types'
+import type { AvatarProps, ButtonProps } from '../types'
 
 const appConfig = _appConfig as AppConfig & { ui: { alert: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/App.vue b/src/runtime/components/App.vue
index 28684c5c..e9facd06 100644
--- a/src/runtime/components/App.vue
+++ b/src/runtime/components/App.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import type { ConfigProviderProps, TooltipProviderProps } from 'radix-vue'
-import type { ToasterProps } from '#ui/types'
+import type { ToasterProps } from '../types'
 
 export interface ProviderProps extends ConfigProviderProps {
   tooltip?: TooltipProviderProps
diff --git a/src/runtime/components/Breadcrumb.vue b/src/runtime/components/Breadcrumb.vue
index 352b383e..a80c1a4f 100644
--- a/src/runtime/components/Breadcrumb.vue
+++ b/src/runtime/components/Breadcrumb.vue
@@ -4,8 +4,8 @@ import type { PrimitiveProps } from 'radix-vue'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/breadcrumb'
-import type { AvatarProps, LinkProps } from '#ui/types'
-import type { DynamicSlots } from '#ui/types/utils'
+import type { AvatarProps, LinkProps } from '../types'
+import type { DynamicSlots } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { breadcrumb: Partial<typeof theme> } }
 
@@ -45,7 +45,7 @@ import { computed } from 'vue'
 import { Primitive } from 'radix-vue'
 import { useAppConfig } from '#imports'
 import { ULink, UIcon, UAvatar } from '#components'
-import { pickLinkProps } from '#ui/utils/link'
+import { pickLinkProps } from '../utils/link'
 
 const props = defineProps<BreadcrumbProps<T>>()
 const slots = defineSlots<BreadcrumbSlots<T>>()
diff --git a/src/runtime/components/Button.vue b/src/runtime/components/Button.vue
index f1c8334b..60a58783 100644
--- a/src/runtime/components/Button.vue
+++ b/src/runtime/components/Button.vue
@@ -3,8 +3,8 @@ import { tv, type VariantProps } from 'tailwind-variants'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/button'
-import type { LinkProps } from '#ui/components/Link.vue'
-import type { UseComponentIconsProps } from '#ui/composables/useComponentIcons'
+import type { LinkProps } from './Link.vue'
+import type { UseComponentIconsProps } from '../composables/useComponentIcons'
 
 const appConfig = _appConfig as AppConfig & { ui: { button: Partial<typeof theme> } }
 
@@ -37,7 +37,7 @@ import { computed } from 'vue'
 import { useForwardProps } from 'radix-vue'
 import { useComponentIcons, useButtonGroup } from '#imports'
 import { UIcon, ULink } from '#components'
-import { pickLinkProps } from '#ui/utils/link'
+import { pickLinkProps } from '../utils/link'
 
 const props = defineProps<ButtonProps>()
 const slots = defineSlots<ButtonSlots>()
diff --git a/src/runtime/components/CommandPalette.vue b/src/runtime/components/CommandPalette.vue
index 0e1a419b..a25a412b 100644
--- a/src/runtime/components/CommandPalette.vue
+++ b/src/runtime/components/CommandPalette.vue
@@ -6,9 +6,9 @@ import type { AppConfig } from '@nuxt/schema'
 import type { UseFuseOptions } from '@vueuse/integrations/useFuse'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/command-palette'
-import type { UseComponentIconsProps } from '#ui/composables/useComponentIcons'
-import type { AvatarProps, ButtonProps, ChipProps, KbdProps, InputProps } from '#ui/types'
-import type { DynamicSlots } from '#ui/types/utils'
+import type { UseComponentIconsProps } from '../composables/useComponentIcons'
+import type { AvatarProps, ButtonProps, ChipProps, KbdProps, InputProps } from '../types'
+import type { DynamicSlots } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { commandPalette: Partial<typeof theme> } }
 
@@ -94,8 +94,8 @@ import { reactivePick } from '@vueuse/core'
 import { useFuse } from '@vueuse/integrations/useFuse'
 import { UInput, UAvatar, UIcon, UKbd, UChip } from '#components'
 import { useAppConfig } from '#imports'
-import { omit } from '#ui/utils'
-import { highlight } from '#ui/utils/fuse'
+import { omit } from '../utils'
+import { highlight } from '../utils/fuse'
 
 const props = withDefaults(defineProps<CommandPaletteProps<G, T>>(), {
   modelValue: '',
diff --git a/src/runtime/components/ContextMenu.vue b/src/runtime/components/ContextMenu.vue
index f187948b..152e3d68 100644
--- a/src/runtime/components/ContextMenu.vue
+++ b/src/runtime/components/ContextMenu.vue
@@ -4,8 +4,8 @@ import type { ContextMenuRootProps, ContextMenuRootEmits, ContextMenuContentProp
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/context-menu'
-import type { AvatarProps, KbdProps, LinkProps } from '#ui/types'
-import type { DynamicSlots } from '#ui/types/utils'
+import type { AvatarProps, KbdProps, LinkProps } from '../types'
+import type { DynamicSlots } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { contextMenu: Partial<typeof theme> } }
 
@@ -60,7 +60,7 @@ import { computed, toRef } from 'vue'
 import { ContextMenuRoot, ContextMenuTrigger, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
 import { UContextMenuContent } from '#components'
-import { omit } from '#ui/utils'
+import { omit } from '../utils'
 
 const props = withDefaults(defineProps<ContextMenuProps<T>>(), {
   portal: true,
diff --git a/src/runtime/components/ContextMenuContent.vue b/src/runtime/components/ContextMenuContent.vue
index a122a171..34a31ac6 100644
--- a/src/runtime/components/ContextMenuContent.vue
+++ b/src/runtime/components/ContextMenuContent.vue
@@ -2,7 +2,7 @@
 import { tv } from 'tailwind-variants'
 import type { ContextMenuContentProps as RadixContextMenuContentProps, ContextMenuContentEmits as RadixContextMenuContentEmits } from 'radix-vue'
 import theme from '#build/ui/context-menu'
-import type { ContextMenuItem, ContextMenuSlots } from '#ui/types'
+import type { ContextMenuItem, ContextMenuSlots } from '../types'
 
 const contextMenu = tv(theme)()
 
@@ -24,8 +24,8 @@ import { useForwardPropsEmits } from 'radix-vue'
 import { reactiveOmit, createReusableTemplate } from '@vueuse/core'
 import { useAppConfig } from '#imports'
 import { ULink } from '#components'
-import { omit } from '#ui/utils'
-import { pickLinkProps } from '#ui/utils/link'
+import { omit } from '../utils'
+import { pickLinkProps } from '../utils/link'
 
 const props = defineProps<ContextMenuContentProps<T>>()
 const emits = defineEmits<ContextMenuContentEmits>()
diff --git a/src/runtime/components/DropdownMenu.vue b/src/runtime/components/DropdownMenu.vue
index 899aac69..3211f3d9 100644
--- a/src/runtime/components/DropdownMenu.vue
+++ b/src/runtime/components/DropdownMenu.vue
@@ -4,8 +4,8 @@ import type { DropdownMenuRootProps, DropdownMenuRootEmits, DropdownMenuContentP
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/dropdown-menu'
-import type { AvatarProps, KbdProps, LinkProps } from '#ui/types'
-import type { DynamicSlots } from '#ui/types/utils'
+import type { AvatarProps, KbdProps, LinkProps } from '../types'
+import type { DynamicSlots } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { dropdownMenu: Partial<typeof theme> } }
 
@@ -72,7 +72,7 @@ import { defu } from 'defu'
 import { DropdownMenuRoot, DropdownMenuTrigger, DropdownMenuArrow, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
 import { UDropdownMenuContent } from '#components'
-import { omit } from '#ui/utils'
+import { omit } from '../utils'
 
 const props = withDefaults(defineProps<DropdownMenuProps<T>>(), {
   portal: true,
diff --git a/src/runtime/components/DropdownMenuContent.vue b/src/runtime/components/DropdownMenuContent.vue
index 0e4784f5..cdf60ebc 100644
--- a/src/runtime/components/DropdownMenuContent.vue
+++ b/src/runtime/components/DropdownMenuContent.vue
@@ -2,7 +2,7 @@
 import { tv } from 'tailwind-variants'
 import type { DropdownMenuContentProps as RadixDropdownMenuContentProps, DropdownMenuContentEmits as RadixDropdownMenuContentEmits } from 'radix-vue'
 import theme from '#build/ui/dropdown-menu'
-import type { KbdProps, AvatarProps, DropdownMenuItem, DropdownMenuSlots } from '#ui/types'
+import type { KbdProps, AvatarProps, DropdownMenuItem, DropdownMenuSlots } from '../types'
 
 const dropdownMenu = tv(theme)()
 
@@ -28,8 +28,8 @@ import { useForwardPropsEmits } from 'radix-vue'
 import { reactiveOmit, createReusableTemplate } from '@vueuse/core'
 import { useAppConfig } from '#imports'
 import { ULink } from '#components'
-import { omit } from '#ui/utils'
-import { pickLinkProps } from '#ui/utils/link'
+import { omit } from '../utils'
+import { pickLinkProps } from '../utils/link'
 
 const props = defineProps<DropdownMenuContentProps<T>>()
 const emits = defineEmits<DropdownMenuContentEmits>()
diff --git a/src/runtime/components/Form.vue b/src/runtime/components/Form.vue
index 92041bb3..d4e5297e 100644
--- a/src/runtime/components/Form.vue
+++ b/src/runtime/components/Form.vue
@@ -3,8 +3,8 @@ import { tv } from 'tailwind-variants'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/form'
-import type { FormSchema, FormError, FormInputEvents, FormErrorEvent, FormSubmitEvent, FormEvent, Form, FormErrorWithId } from '#ui/types/form'
-import { FormValidationException } from '#ui/types/form'
+import type { FormSchema, FormError, FormInputEvents, FormErrorEvent, FormSubmitEvent, FormEvent, Form, FormErrorWithId } from '../types/form'
+import { FormValidationException } from '../types/form'
 
 import { formOptionsInjectionKey, formInputsInjectionKey, formBusInjectionKey, useId } from '#imports'
 
@@ -36,7 +36,7 @@ export interface FormSlots {
 <script lang="ts" setup generic="T extends object">
 import { provide, inject, nextTick, ref, onUnmounted, onMounted, computed } from 'vue'
 import { useEventBus } from '@vueuse/core'
-import { getYupErrors, isYupSchema, getValibotError, isValibotSchema, getZodErrors, isZodSchema, getJoiErrors, isJoiSchema } from '#ui/utils/form'
+import { getYupErrors, isYupSchema, getValibotError, isValibotSchema, getZodErrors, isZodSchema, getJoiErrors, isJoiSchema } from '../utils/form'
 
 const props = withDefaults(defineProps<FormProps<T>>(), {
   validateOn() {
diff --git a/src/runtime/components/FormField.vue b/src/runtime/components/FormField.vue
index 28e2e6e9..0819393b 100644
--- a/src/runtime/components/FormField.vue
+++ b/src/runtime/components/FormField.vue
@@ -38,8 +38,8 @@ export interface FormFieldSlots {
 <script lang="ts" setup>
 import { computed, ref, inject, provide, type Ref } from 'vue'
 import { Label } from 'radix-vue'
-import type { FormError } from '#ui/types/form'
 import { useId, formFieldInjectionKey } from '#imports'
+import type { FormError } from '../types/form'
 
 const props = defineProps<FormFieldProps>()
 const slots = defineSlots<FormFieldSlots>()
diff --git a/src/runtime/components/Input.vue b/src/runtime/components/Input.vue
index 015d19bf..4c971577 100644
--- a/src/runtime/components/Input.vue
+++ b/src/runtime/components/Input.vue
@@ -4,7 +4,7 @@ import { tv, type VariantProps } from 'tailwind-variants'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/input'
-import type { UseComponentIconsProps } from '#ui/composables/useComponentIcons'
+import type { UseComponentIconsProps } from '../composables/useComponentIcons'
 
 const appConfig = _appConfig as AppConfig & { ui: { input: Partial<typeof theme> } }
 
@@ -45,7 +45,7 @@ export interface InputSlots {
 import { ref, computed, onMounted } from 'vue'
 import { useComponentIcons, useFormField, useButtonGroup } from '#imports'
 import { UIcon } from '#components'
-import { looseToNumber } from '#ui/utils'
+import { looseToNumber } from '../utils'
 
 defineOptions({ inheritAttrs: false })
 
diff --git a/src/runtime/components/InputMenu.vue b/src/runtime/components/InputMenu.vue
index 2736dd18..b6480341 100644
--- a/src/runtime/components/InputMenu.vue
+++ b/src/runtime/components/InputMenu.vue
@@ -5,9 +5,9 @@ import type { ComboboxRootProps, ComboboxRootEmits, ComboboxContentProps, Combob
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/input-menu'
-import type { UseComponentIconsProps } from '#ui/composables/useComponentIcons'
-import type { AvatarProps, ChipProps, InputProps } from '#ui/types'
-import type { AcceptableValue, ArrayOrWrapped } from '#ui/types/utils'
+import type { UseComponentIconsProps } from '../composables/useComponentIcons'
+import type { AvatarProps, ChipProps, InputProps } from '../types'
+import type { AcceptableValue, ArrayOrWrapped } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { inputMenu: Partial<typeof theme> } }
 
@@ -104,7 +104,7 @@ import { defu } from 'defu'
 import { reactivePick } from '@vueuse/core'
 import { useAppConfig, useFormField, useButtonGroup, useComponentIcons } from '#imports'
 import { UIcon, UChip, UAvatar } from '#components'
-import { get } from '#ui/utils'
+import { get } from '../utils'
 
 defineOptions({ inheritAttrs: false })
 
diff --git a/src/runtime/components/Kbd.vue b/src/runtime/components/Kbd.vue
index a8e0de22..8a94a5d1 100644
--- a/src/runtime/components/Kbd.vue
+++ b/src/runtime/components/Kbd.vue
@@ -4,7 +4,7 @@ import type { PrimitiveProps } from 'radix-vue'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/kbd'
-import type { KbdKey } from '#ui/composables/useKbd'
+import type { KbdKey } from '../composables/useKbd'
 
 const appConfig = _appConfig as AppConfig & { ui: { kbd: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Modal.vue b/src/runtime/components/Modal.vue
index 09d501c6..d06c5dae 100644
--- a/src/runtime/components/Modal.vue
+++ b/src/runtime/components/Modal.vue
@@ -4,7 +4,7 @@ import type { DialogRootProps, DialogRootEmits, DialogContentProps } from 'radix
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/modal'
-import type { ButtonProps } from '#ui/types'
+import type { ButtonProps } from '../types'
 
 const appConfig = _appConfig as AppConfig & { ui: { modal: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/NavigationMenu.vue b/src/runtime/components/NavigationMenu.vue
index 250f9232..f2d4b2a1 100644
--- a/src/runtime/components/NavigationMenu.vue
+++ b/src/runtime/components/NavigationMenu.vue
@@ -4,8 +4,8 @@ import type { NavigationMenuRootProps, NavigationMenuRootEmits, NavigationMenuIt
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/navigation-menu'
-import type { AvatarProps, BadgeProps, LinkProps } from '#ui/types'
-import type { DynamicSlots } from '#ui/types/utils'
+import type { AvatarProps, BadgeProps, LinkProps } from '../types'
+import type { DynamicSlots } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { navigationMenu: Partial<typeof theme> } }
 
@@ -76,7 +76,7 @@ import { computed, toRef } from 'vue'
 import { NavigationMenuRoot, NavigationMenuList, NavigationMenuItem, NavigationMenuTrigger, NavigationMenuContent, NavigationMenuLink, NavigationMenuIndicator, NavigationMenuViewport, useForwardPropsEmits } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
 import { UIcon, UAvatar, UBadge, ULink, ULinkBase } from '#components'
-import { pickLinkProps } from '#ui/utils/link'
+import { pickLinkProps } from '../utils/link'
 
 const props = withDefaults(defineProps<NavigationMenuProps<T>>(), {
   orientation: 'horizontal',
diff --git a/src/runtime/components/Pagination.vue b/src/runtime/components/Pagination.vue
index a8056735..bdfa71b4 100644
--- a/src/runtime/components/Pagination.vue
+++ b/src/runtime/components/Pagination.vue
@@ -5,7 +5,7 @@ import type { AppConfig } from '@nuxt/schema'
 import type { RouteLocationRaw } from '#vue-router'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/pagination'
-import type { ButtonProps } from '#ui/types'
+import type { ButtonProps } from '../types'
 
 const appConfig = _appConfig as AppConfig & { ui: { pagination: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/RadioGroup.vue b/src/runtime/components/RadioGroup.vue
index 219bfff7..6b394078 100644
--- a/src/runtime/components/RadioGroup.vue
+++ b/src/runtime/components/RadioGroup.vue
@@ -4,7 +4,7 @@ import type { RadioGroupRootProps, RadioGroupRootEmits, RadioGroupItemProps } fr
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/radio-group'
-import type { AcceptableValue } from '#ui/types/utils'
+import type { AcceptableValue } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { radioGroup: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Select.vue b/src/runtime/components/Select.vue
index 835dc60f..b4fee491 100644
--- a/src/runtime/components/Select.vue
+++ b/src/runtime/components/Select.vue
@@ -4,9 +4,9 @@ import type { SelectRootProps, SelectRootEmits, SelectContentProps, SelectArrowP
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/select'
-import type { UseComponentIconsProps } from '#ui/composables/useComponentIcons'
-import type { AvatarProps, ChipProps, InputProps } from '#ui/types'
-import type { AcceptableValue } from '#ui/types/utils'
+import type { UseComponentIconsProps } from '../composables/useComponentIcons'
+import type { AvatarProps, ChipProps, InputProps } from '../types'
+import type { AcceptableValue } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { select: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/SelectMenu.vue b/src/runtime/components/SelectMenu.vue
index ab8d4e7f..01038d9b 100644
--- a/src/runtime/components/SelectMenu.vue
+++ b/src/runtime/components/SelectMenu.vue
@@ -4,9 +4,9 @@ import type { ComboboxRootProps, ComboboxRootEmits, ComboboxContentProps, Combob
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/select-menu'
-import type { UseComponentIconsProps } from '#ui/composables/useComponentIcons'
-import type { AvatarProps, ChipProps, InputProps } from '#ui/types'
-import type { AcceptableValue, ArrayOrWrapped } from '#ui/types/utils'
+import type { UseComponentIconsProps } from '../composables/useComponentIcons'
+import type { AvatarProps, ChipProps, InputProps } from '../types'
+import type { AcceptableValue, ArrayOrWrapped } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { selectMenu: Partial<typeof theme> } }
 
@@ -95,7 +95,7 @@ import { defu } from 'defu'
 import { reactivePick } from '@vueuse/core'
 import { useAppConfig, useFormField, useButtonGroup, useComponentIcons } from '#imports'
 import { UIcon, UChip, UAvatar } from '#components'
-import { get } from '#ui/utils'
+import { get } from '../utils'
 
 const props = withDefaults(defineProps<SelectMenuProps<T>>(), {
   portal: true,
diff --git a/src/runtime/components/Separator.vue b/src/runtime/components/Separator.vue
index 69fc3081..d0c38c09 100644
--- a/src/runtime/components/Separator.vue
+++ b/src/runtime/components/Separator.vue
@@ -1,10 +1,10 @@
 <script lang="ts">
 import { tv, type VariantProps } from 'tailwind-variants'
 import type { SeparatorProps as _SeparatorProps } from 'radix-vue'
-import type { AvatarProps } from '#ui/types'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/separator'
+import type { AvatarProps } from '../types'
 
 const appConfig = _appConfig as AppConfig & { ui: { separator: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Slideover.vue b/src/runtime/components/Slideover.vue
index 491e7618..f47a6bc1 100644
--- a/src/runtime/components/Slideover.vue
+++ b/src/runtime/components/Slideover.vue
@@ -4,7 +4,7 @@ import type { DialogRootProps, DialogRootEmits, DialogContentProps } from 'radix
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/slideover'
-import type { ButtonProps } from '#ui/types'
+import type { ButtonProps } from '../types'
 
 const appConfig = _appConfig as AppConfig & { ui: { slideover: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Tabs.vue b/src/runtime/components/Tabs.vue
index 18fb6b12..aeb59ea8 100644
--- a/src/runtime/components/Tabs.vue
+++ b/src/runtime/components/Tabs.vue
@@ -4,8 +4,8 @@ import type { TabsRootProps, TabsRootEmits, TabsContentProps, TabsTriggerProps }
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/tabs'
-import type { AvatarProps } from '#ui/types'
-import type { DynamicSlots } from '#ui/types/utils'
+import type { AvatarProps } from '../types'
+import type { DynamicSlots } from '../types/utils'
 
 const appConfig = _appConfig as AppConfig & { ui: { tabs: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Textarea.vue b/src/runtime/components/Textarea.vue
index 64f1c02d..d303424e 100644
--- a/src/runtime/components/Textarea.vue
+++ b/src/runtime/components/Textarea.vue
@@ -42,7 +42,7 @@ export interface TextareaSlots {
 <script lang="ts" setup>
 import { ref, computed, onMounted, nextTick, watch } from 'vue'
 import { useFormField } from '#imports'
-import { looseToNumber } from '#ui/utils'
+import { looseToNumber } from '../utils'
 
 defineOptions({ inheritAttrs: false })
 
diff --git a/src/runtime/components/Toast.vue b/src/runtime/components/Toast.vue
index 22e12932..3d153f8c 100644
--- a/src/runtime/components/Toast.vue
+++ b/src/runtime/components/Toast.vue
@@ -5,7 +5,7 @@ import type { ToastRootProps, ToastRootEmits } from 'radix-vue'
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/toast'
-import type { AvatarProps, ButtonProps, ToasterContext } from '#ui/types'
+import type { AvatarProps, ButtonProps, ToasterContext } from '../types'
 
 const appConfig = _appConfig as AppConfig & { ui: { toast: Partial<typeof theme> } }
 
diff --git a/src/runtime/components/Toaster.vue b/src/runtime/components/Toaster.vue
index 71b3e434..0ad51e40 100644
--- a/src/runtime/components/Toaster.vue
+++ b/src/runtime/components/Toaster.vue
@@ -38,7 +38,7 @@ import { ToastProvider, ToastViewport, useForwardProps } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
 import { useToast } from '#imports'
 import { UToast } from '#components'
-import { omit } from '#ui/utils'
+import { omit } from '../utils'
 
 const props = withDefaults(defineProps<ToasterProps>(), {
   expand: true,
diff --git a/src/runtime/components/Tooltip.vue b/src/runtime/components/Tooltip.vue
index 574aa9ce..7ad4caaf 100644
--- a/src/runtime/components/Tooltip.vue
+++ b/src/runtime/components/Tooltip.vue
@@ -4,7 +4,7 @@ import type { TooltipRootProps, TooltipRootEmits, TooltipContentProps, TooltipAr
 import type { AppConfig } from '@nuxt/schema'
 import _appConfig from '#build/app.config'
 import theme from '#build/ui/tooltip'
-import type { KbdProps } from '#ui/types'
+import type { KbdProps } from '../types'
 
 const appConfig = _appConfig as AppConfig & { ui: { tooltip: Partial<typeof theme> } }
 
diff --git a/src/runtime/composables/useAvatarGroup.ts b/src/runtime/composables/useAvatarGroup.ts
index 3303395c..f9667bd4 100644
--- a/src/runtime/composables/useAvatarGroup.ts
+++ b/src/runtime/composables/useAvatarGroup.ts
@@ -1,5 +1,5 @@
 import { inject, provide, computed, type ComputedRef, type InjectionKey } from 'vue'
-import type { AvatarGroupProps } from '#ui/types'
+import type { AvatarGroupProps } from '../types'
 
 export const avatarGroupInjectionKey: InjectionKey<ComputedRef<{ size: AvatarGroupProps['size'] }>> = Symbol('nuxt-ui.avatar-group')
 
diff --git a/src/runtime/composables/useButtonGroup.ts b/src/runtime/composables/useButtonGroup.ts
index 979722ac..7e629642 100644
--- a/src/runtime/composables/useButtonGroup.ts
+++ b/src/runtime/composables/useButtonGroup.ts
@@ -1,7 +1,7 @@
 import { type InjectionKey, type ComputedRef } from 'vue'
 import { inject, computed } from 'vue'
-import type { GetObjectField } from '#ui/types/utils'
 import type { ButtonGroupProps } from '../components/ButtonGroup.vue'
+import type { GetObjectField } from '../types/utils'
 
 export const buttonGroupInjectionKey: InjectionKey<ComputedRef<{
   size: ButtonGroupProps ['size']
diff --git a/src/runtime/composables/useFormField.ts b/src/runtime/composables/useFormField.ts
index 8e532021..8cf56397 100644
--- a/src/runtime/composables/useFormField.ts
+++ b/src/runtime/composables/useFormField.ts
@@ -1,8 +1,8 @@
 import { inject, ref, computed, type InjectionKey, type Ref, type ComputedRef } from 'vue'
 import { type UseEventBusReturn, useDebounceFn } from '@vueuse/core'
-import type { FormEvent, FormInputEvents, FormFieldInjectedOptions, FormInjectedOptions } from '#ui/types/form'
-import type { GetObjectField } from '#ui/types/utils'
-import type { FormFieldProps } from '#ui/types'
+import type { FormFieldProps } from '../types'
+import type { FormEvent, FormInputEvents, FormFieldInjectedOptions, FormInjectedOptions } from '../types/form'
+import type { GetObjectField } from '../types/utils'
 
 type Props<T> = {
   id?: string
diff --git a/src/runtime/composables/useModal.ts b/src/runtime/composables/useModal.ts
index e6a74bdd..7be72d66 100644
--- a/src/runtime/composables/useModal.ts
+++ b/src/runtime/composables/useModal.ts
@@ -1,8 +1,8 @@
 import { ref, inject } from 'vue'
 import type { ShallowRef, Component, InjectionKey } from 'vue'
 import { createSharedComposable } from '@vueuse/core'
-import type { ModalProps } from '#ui/types'
-import type { ComponentProps } from '#ui/types/component'
+import type { ModalProps } from '../types'
+import type { ComponentProps } from '../types/component'
 
 export interface ModalState {
   component: Component | string
diff --git a/src/runtime/composables/useSlideover.ts b/src/runtime/composables/useSlideover.ts
index 731784cd..c78fc9b4 100644
--- a/src/runtime/composables/useSlideover.ts
+++ b/src/runtime/composables/useSlideover.ts
@@ -1,8 +1,8 @@
 import { ref, inject } from 'vue'
 import type { ShallowRef, Component, InjectionKey } from 'vue'
 import { createSharedComposable } from '@vueuse/core'
-import type { SlideoverProps } from '#ui/types'
-import type { ComponentProps } from '#ui/types/component'
+import type { SlideoverProps } from '../types'
+import type { ComponentProps } from '../types/component'
 
 export interface SlideoverState {
   component: Component | string
diff --git a/src/runtime/composables/useToast.ts b/src/runtime/composables/useToast.ts
index 781047d2..feb139ed 100644
--- a/src/runtime/composables/useToast.ts
+++ b/src/runtime/composables/useToast.ts
@@ -1,5 +1,5 @@
-import type { ToastProps } from '#ui/types'
 import { useState } from '#imports'
+import type { ToastProps } from '../types'
 
 export interface Toast extends Omit<ToastProps, 'defaultOpen'> {
   id: string | number
diff --git a/src/runtime/types/component.d.ts b/src/runtime/types/component.ts
similarity index 100%
rename from src/runtime/types/component.d.ts
rename to src/runtime/types/component.ts
diff --git a/src/runtime/types/index.d.ts b/src/runtime/types/index.ts
similarity index 98%
rename from src/runtime/types/index.d.ts
rename to src/runtime/types/index.ts
index ec946a22..dc8dc09f 100644
--- a/src/runtime/types/index.d.ts
+++ b/src/runtime/types/index.ts
@@ -39,3 +39,4 @@ export * from '../components/Textarea.vue'
 export * from '../components/Toast.vue'
 export * from '../components/Toaster.vue'
 export * from '../components/Tooltip.vue'
+export * from './form'
diff --git a/src/runtime/types/utils.d.ts b/src/runtime/types/utils.ts
similarity index 100%
rename from src/runtime/types/utils.d.ts
rename to src/runtime/types/utils.ts
diff --git a/src/runtime/utils/form.ts b/src/runtime/utils/form.ts
index 7be56c5c..cfa30778 100644
--- a/src/runtime/utils/form.ts
+++ b/src/runtime/utils/form.ts
@@ -2,7 +2,7 @@ import type { ZodSchema } from 'zod'
 import type { ValidationError as JoiError, Schema as JoiSchema } from 'joi'
 import type { ObjectSchema as YupObjectSchema, ValidationError as YupError } from 'yup'
 import type { ObjectSchemaAsync as ValibotObjectSchema } from 'valibot'
-import type { FormError } from '#ui/types/form'
+import type { FormError } from '../types/form'
 
 export function isYupSchema(schema: any): schema is YupObjectSchema<any> {
   return schema.validate && schema.__isYupSchema__
diff --git a/src/runtime/utils/link.ts b/src/runtime/utils/link.ts
index ef3adc09..7ddd15ce 100644
--- a/src/runtime/utils/link.ts
+++ b/src/runtime/utils/link.ts
@@ -1,5 +1,5 @@
 import { reactivePick } from '@vueuse/core'
-import type { LinkProps } from '#ui/types'
+import type { LinkProps } from '../types'
 
 export function pickLinkProps(link: LinkProps) {
   return reactivePick(link, 'active', 'activeClass', 'ariaCurrentValue', 'as', 'disabled', 'exact', 'exactActiveClass', 'exactHash', 'exactQuery', 'external', 'href', 'inactiveClass', 'noPrefetch', 'noRel', 'prefetch', 'prefetchedClass', 'rel', 'replace', 'target', 'to', 'type')