From 28b736a703e9318cf362c914f03a504133d1b806 Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Thu, 11 Jan 2024 12:16:27 +0100
Subject: [PATCH] chore(utils): improve link utils

---
 src/runtime/components/elements/Button.vue  |  3 +-
 src/runtime/components/elements/Link.vue    |  2 +-
 src/runtime/utils/index.ts                  |  1 +
 src/runtime/utils/{nuxt-link.ts => link.ts} | 43 +++++++++++++++++++--
 4 files changed, 42 insertions(+), 7 deletions(-)
 rename src/runtime/utils/{nuxt-link.ts => link.ts} (64%)

diff --git a/src/runtime/components/elements/Button.vue b/src/runtime/components/elements/Button.vue
index 1658f216..cdcdf2dd 100644
--- a/src/runtime/components/elements/Button.vue
+++ b/src/runtime/components/elements/Button.vue
@@ -23,8 +23,7 @@ import { twMerge, twJoin } from 'tailwind-merge'
 import UIcon from '../elements/Icon.vue'
 import ULink from '../elements/Link.vue'
 import { useUI } from '../../composables/useUI'
-import { mergeConfig } from '../../utils'
-import { nuxtLinkProps, getNuxtLinkProps } from '../../utils/nuxt-link'
+import { mergeConfig, nuxtLinkProps, getNuxtLinkProps } from '../../utils'
 import { useInjectButtonGroup } from '../../composables/useButtonGroup'
 import type { ButtonColor, ButtonSize, ButtonVariant, Strategy } from '../../types'
 // @ts-expect-error
diff --git a/src/runtime/components/elements/Link.vue b/src/runtime/components/elements/Link.vue
index 817b7fbf..0f3681f8 100644
--- a/src/runtime/components/elements/Link.vue
+++ b/src/runtime/components/elements/Link.vue
@@ -33,7 +33,7 @@
 <script lang="ts">
 import { isEqual } from 'ohash'
 import { defineComponent } from 'vue'
-import { nuxtLinkProps } from '../../utils/nuxt-link'
+import { nuxtLinkProps } from '../../utils'
 
 export default defineComponent({
   inheritAttrs: false,
diff --git a/src/runtime/utils/index.ts b/src/runtime/utils/index.ts
index f9f4be1a..17db95b1 100644
--- a/src/runtime/utils/index.ts
+++ b/src/runtime/utils/index.ts
@@ -74,3 +74,4 @@ export function looseToNumber (val: any): any {
 }
 
 export * from './lodash'
+export * from './link'
diff --git a/src/runtime/utils/nuxt-link.ts b/src/runtime/utils/link.ts
similarity index 64%
rename from src/runtime/utils/nuxt-link.ts
rename to src/runtime/utils/link.ts
index 256de692..7784f4c7 100644
--- a/src/runtime/utils/nuxt-link.ts
+++ b/src/runtime/utils/link.ts
@@ -61,12 +61,47 @@ export const nuxtLinkProps = {
   }
 } as const
 
-export const getNuxtLinkProps = (props: Record<string, unknown>) => {
-  const nuxtLinkPropsKeys = Object.keys(nuxtLinkProps)
-  return nuxtLinkPropsKeys.reduce((acc, key) => {
+const uLinkProps = {
+  active: {
+    type: Boolean,
+    default: undefined
+  },
+  exact: {
+    type: Boolean,
+    default: false
+  },
+  exactQuery: {
+    type: Boolean,
+    default: false
+  },
+  exactHash: {
+    type: Boolean,
+    default: false
+  },
+  inactiveClass: {
+    type: String,
+    default: undefined
+  }
+} as const
+
+export const getNuxtLinkProps = (props) => {
+  const keys = Object.keys(nuxtLinkProps)
+
+  return keys.reduce((acc, key) => {
     if (props[key] !== undefined) {
       acc[key] = props[key]
     }
     return acc
-  }, {} as Record<string, unknown>)
+  }, {})
+}
+
+export const getULinkProps = (props) => {
+  const keys = [...Object.keys(nuxtLinkProps), ...Object.keys(uLinkProps)]
+
+  return keys.reduce((acc, key) => {
+    if (props[key] !== undefined) {
+      acc[key] = props[key]
+    }
+    return acc
+  }, {})
 }