refactor: reduce types

Author: posva

packages/router/src/typed-routes/route-map.ts

@@ -18,14 +18,15 @@ export interface RouteRecordInfo<
   ParamsRaw extends RouteParamsRawGeneric = RouteParamsRawGeneric,
   Params extends RouteParamsGeneric = RouteParamsGeneric,
   Meta extends RouteMeta = RouteMeta,
-  _ChildrenRouteNames extends string | symbol = never,
+  ChildrenNames extends string | symbol | never = never | string | symbol,
 > {
   name: Name
   path: Path
   paramsRaw: ParamsRaw
   params: Params
   // TODO: implement meta with a defineRoute macro
   meta: Meta
+  childrenNames: ChildrenNames
 }
 
 /**
@@ -40,28 +41,3 @@ export type RouteMap =
  * Generic version of the `RouteMap`.
  */
 export type RouteMapGeneric = Record<string | symbol, RouteRecordInfo>
-
-/**
- * Returns a union of route names from children of the route with given route name
- */
-export type GetDeepChildrenRouteNames<Name extends keyof RouteMap> =
-  RouteMap[Name] extends RouteRecordInfo<
-    any,
-    any,
-    any,
-    any,
-    any,
-    infer ChildrenNames
-  >
-    ? ChildrenNames extends any
-      ? ChildrenNames | GetDeepChildrenRouteNames<ChildrenNames>
-      : never
-    : never
-
-/**
- * Returns a union of given route name and the route names of children of that route
- */
-export type RouteNameWithChildren<Name extends keyof RouteMap> =
-  RouteMapGeneric extends RouteMap
-    ? Name
-    : Name | GetDeepChildrenRouteNames<Name>

packages/router/src/useApi.ts

@@ -1,7 +1,7 @@
 import { inject } from 'vue'
 import { routerKey, routeLocationKey } from './injectionSymbols'
 import { Router } from './router'
-import { RouteMap, RouteNameWithChildren } from './typed-routes/route-map'
+import { RouteMap } from './typed-routes/route-map'
 import { RouteLocationNormalizedLoaded } from './typed-routes'
 
 /**
@@ -12,17 +12,14 @@ export function useRouter(): Router {
   return inject(routerKey)!
 }
 
-type GetRouteLocationNormalizedLoaded<Name extends keyof RouteMap> =
-  Name extends any ? RouteLocationNormalizedLoaded<Name> : never
-
 /**
  * Returns the current route location. Equivalent to using `$route` inside
  * templates.
  */
-export function useRoute<
-  CurrentRouteName extends keyof RouteMap = keyof RouteMap,
->(_currentRouteName?: CurrentRouteName) {
-  return inject(routeLocationKey) as GetRouteLocationNormalizedLoaded<
-    RouteNameWithChildren<CurrentRouteName>
+export function useRoute<Name extends keyof RouteMap = keyof RouteMap>(
+  _name?: Name
+) {
+  return inject(routeLocationKey) as RouteLocationNormalizedLoaded<
+    Name | RouteMap[Name]['childrenNames']
   >
 }

packages/router/test-dts/typed-routes.test-d.ts

@@ -36,7 +36,7 @@ export type RouteMap = {
     Record<never, never>,
     Record<never, never>,
     RouteMeta,
-    '/a/b'
+    '/a/b' | '/a/b/c'
   >
   '/a/b': RouteRecordInfo<
     '/a/b',