Put safeGetParamValue back and add overloads

kitbagjs · Nov 19, 2024 · 972fb42 · 972fb42
1 parent 2f5f8f1
commit 972fb42
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/src/compositions/useQueryValue.ts b/src/compositions/useQueryValue.ts
@@ -2,68 +2,57 @@ import { computed, Ref, MaybeRefOrGetter, toValue } from 'vue'
 import { useRoute } from './useRoute'
 import { Param } from '@/types'
 import { ExtractParamType } from '@/types/params'
-import { getParamValue, setParamValue } from '@/services/params'
-import { InvalidRouteParamValueError } from '@/errors/invalidRouteParamValueError'
+import { safeGetParamValue, setParamValue } from '@/services/params'
 
 export type UseQueryValue<T> = {
   value: Ref<T | null>,
   values: Ref<T[]>,
 }
 
+export function useQueryValue(key: MaybeRefOrGetter<string>): UseQueryValue<string>
+
 export function useQueryValue<
   TParam extends Param,
   TParamType extends ExtractParamType<TParam>
 >(
   key: MaybeRefOrGetter<string>,
-  type: TParam,
-): UseQueryValue<TParamType> {
+  param: TParam
+): UseQueryValue<ExtractParamType<TParamType>>
+
+export function useQueryValue(
+  key: MaybeRefOrGetter<string>,
+  param: Param = String,
+): UseQueryValue<unknown> {
   const route = useRoute()
 
-  const value = computed<TParamType | null>({
+  const value = computed({
     get() {
       const value = route.query.get(toValue(key))
 
       if (value === null) {
         return null
       }
 
-      try {
-        return getParamValue(value, type)
-      } catch (error) {
-        if (error instanceof InvalidRouteParamValueError) {
-          return null
-        }
-
-        throw error
-      }
+      return safeGetParamValue(value, param)
     },
-    set(value: TParamType | null) {
-      route.query.set(toValue(key), setParamValue(value, type))
+    set(value) {
+      route.query.set(toValue(key), setParamValue(value, param))
     },
   })
 
-  const values = computed<TParamType[]>({
+  const values = computed({
     get() {
       const values = route.query.getAll(toValue(key))
 
       return values
-        .map((value) => {
-          try {
-            return getParamValue(value, type)
-          } catch (error) {
-            if (error instanceof InvalidRouteParamValueError) {
-              return null
-            }
-            throw error
-          }
-        })
-        .filter((value): value is TParamType => value !== null)
+        .map((value) => safeGetParamValue(value, param))
+        .filter((value) => value !== null)
     },
-    set(values: TParamType[]) {
+    set(values) {
       route.query.delete(toValue(key))
 
       values.forEach((value) => {
-        route.query.append(toValue(key), setParamValue(value, type))
+        route.query.append(toValue(key), setParamValue(value, param))
       })
     },
   })

diff --git a/src/services/params.ts b/src/services/params.ts
@@ -157,6 +157,17 @@ export function getParamValue<T extends Param>(value: string | undefined, param:
   return value
 }
 
+export function safeGetParamValue<T extends Param>(value: string | undefined, param: T, isOptional = false): ExtractParamType<T> | undefined {
+  try {
+    return getParamValue(value, param, isOptional)
+  } catch (error) {
+    if (error instanceof InvalidRouteParamValueError) {
+      return undefined
+    }
+    throw error
+  }
+}
+
 export function setParamValue(value: unknown, param: Param, isOptional = false): string {
   if (value === undefined) {
     if (isOptional) {