Fix isRoute return type for non exact matches

src/guards/routes.spec-d.ts

@@ -27,7 +27,7 @@ test('router route can be narrowed', () => {
       path: '/parentB',
       component,
     }),
-  ]
+  ] as const
 
   const { route } = createRouter(routes)
 
@@ -41,12 +41,20 @@ test('router route can be narrowed', () => {
     expectTypeOf<typeof route.name>().toMatchTypeOf<'parentA'>()
   }
 
+  if (isRoute(route, 'parentB', { exact: true })) {
+    expectTypeOf<typeof route.name>().toMatchTypeOf<'parentB'>()
+  }
+
   if (isRoute(route, 'parentA', { exact: false })) {
-    expectTypeOf<typeof route.name>().toMatchTypeOf<'parentA' | 'parentA.childA'>()
+    expectTypeOf<typeof route.name>().toMatchTypeOf<'parentA' | 'childA'>()
+  }
+
+  if (isRoute(route, 'parentB', { exact: false })) {
+    expectTypeOf<typeof route.name>().toMatchTypeOf<'parentB'>()
   }
 
   if (isRoute(route, 'parentA')) {
-    expectTypeOf<typeof route.name>().toMatchTypeOf<'parentA' | 'parentA.childA'>()
+    expectTypeOf<typeof route.name>().toMatchTypeOf<'parentA' | 'childA'>()
   }
 
   if (route.name === 'parentA') {

src/guards/routes.ts

@@ -1,30 +1,38 @@
 import { RouterRoute, isRouterRoute } from '@/services/createRouterRoute'
-import { toName } from '@/types/name'
 import { RegisteredRouterRoute, RegisteredRoutesName } from '@/types/register'
 
 export type IsRouteOptions = {
   exact?: boolean,
 }
 
+type RouteWithMatch<
+  TRoute extends RouterRoute,
+  TRouteName extends TRoute['name']
+> = TRoute extends RouterRoute
+  ? TRouteName extends TRoute['matches'][number]['name']
+    ? TRoute
+    : never
+  : never
+
 export function isRoute(route: unknown): route is RouterRoute
 
 export function isRoute<
   TRoute extends RouterRoute,
   TRouteName extends TRoute['name']
->(route: TRoute, routeName: TRouteName, options: IsRouteOptions & { exact: true }): route is TRoute & { name: TRouteName }
+>(route: TRoute, routeName: TRouteName, options: IsRouteOptions & { exact: true }): route is TRoute & {name: TRouteName}
 
 export function isRoute<
   TRoute extends RouterRoute,
   TRouteName extends TRoute['name']
->(route: TRoute, routeName: TRouteName, options?: IsRouteOptions): route is TRoute & { name: `${TRouteName}${string}` }
+>(route: TRoute, routeName: TRouteName, options?: IsRouteOptions): route is RouteWithMatch<TRoute, TRouteName>
 
 export function isRoute<
   TRouteName extends RegisteredRoutesName
 >(route: unknown, routeName: TRouteName, options: IsRouteOptions & { exact: true }): route is RegisteredRouterRoute & { name: TRouteName }
 
 export function isRoute<
   TRouteName extends RegisteredRoutesName
->(route: unknown, routeName: TRouteName, options?: IsRouteOptions): route is RegisteredRouterRoute & { name: `${TRouteName}${string}` }
+>(route: unknown, routeName: TRouteName, options?: IsRouteOptions): route is RouteWithMatch<RegisteredRouterRoute, TRouteName>
 
 export function isRoute(route: unknown, routeName?: string, options?: IsRouteOptions): boolean
 
@@ -37,13 +45,9 @@ export function isRoute(route: unknown, routeName?: string, { exact }: IsRouteOp
     return true
   }
 
-  const names = route.matches.map((route) => toName(route.name))
-
   if (exact) {
-    const actualRouteName = names.at(-1)
-
-    return routeName === actualRouteName
+    return route.matched.name === routeName
   }
 
-  return names.includes(routeName)
+  return route.matches.map((route) => route.name).includes(routeName)
 }