Fix the type error with possibly infinite deep

kitbagjs · Dec 30, 2023 · 0248ecc · 0248ecc
1 parent 2937821
commit 0248ecc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/utilities/createRouteMethods.spec.ts b/src/utilities/createRouteMethods.spec.ts
@@ -18,7 +18,7 @@ describe('createRouteMethods', () => {
     ] as const satisfies Routes
     const resolved = resolveRoutes(routes)
 
-    const response = createRouteMethods(resolved)
+    const response = createRouteMethods<typeof routes>(resolved)
 
     expect(response.parent).toBeTypeOf('function')
   })
@@ -34,7 +34,7 @@ describe('createRouteMethods', () => {
     ] as const satisfies Routes
     const resolved = resolveRoutes(routes)
 
-    const response = createRouteMethods(resolved)
+    const response = createRouteMethods<typeof routes>(resolved)
 
     expect(response).toMatchObject({})
   })
@@ -60,7 +60,7 @@ describe('createRouteMethods', () => {
     ] as const satisfies Routes
     const resolved = resolveRoutes(routes)
 
-    const response = createRouteMethods(resolved)
+    const response = createRouteMethods<typeof routes>(resolved)
 
     expect(response.parent.child).toBeDefined()
 
@@ -91,7 +91,7 @@ describe('createRouteMethods', () => {
     ] as const satisfies Routes
     const resolved = resolveRoutes(routes)
 
-    const response = createRouteMethods(resolved)
+    const response = createRouteMethods<typeof routes>(resolved)
 
     expect(response.parent).toBeTypeOf('function')
     expect(response.parent.child).toBeTypeOf('function')

diff --git a/src/utilities/createRouteMethods.ts b/src/utilities/createRouteMethods.ts
@@ -1,4 +1,4 @@
-import { Resolved, Route, RouteMethodResponse, isPublicRoute } from '@/types'
+import { Resolved, Route, RouteMethodResponse, RouteMethods, Routes, isPublicRoute } from '@/types'
 import { assembleUrl } from '@/utilities/urlAssembly'
 
 type NonCallableNode = Record<string, any>
@@ -7,14 +7,14 @@ type CallableNode = NonCallableNode & {
 }
 type Node = CallableNode | NonCallableNode
 
-export function createRouteMethods(routes: Resolved<Route>[]): Record<string, Node> {
+export function createRouteMethods<T extends Routes>(routes: Resolved<Route>[]): RouteMethods<T> {
   const methods: Record<string, any> = {}
 
   routes.forEach(route => {
     traverseParents(route, methods)
   })
 
-  return methods
+  return methods as unknown as RouteMethods<T>
 }
 
 function traverseParents(route: Resolved<Route>, currentLevel: Record<string, any>): Record<string, any> {

diff --git a/src/utilities/createRouter.ts b/src/utilities/createRouter.ts
@@ -48,7 +48,7 @@ export function createRouter<T extends Routes>(routes: T): Router<T> {
   }
 
   const router = {
-    routes: createRouteMethods(resolved) as RouteMethods<T>,
+    routes: createRouteMethods<T>(resolved),
     push,
     replace,
     forward,