@devp0nt/route0 1.0.0-next.57 → 1.0.0-next.59

package/src/index.test.ts

@@ -960,6 +960,7 @@ describe('getLocation', () => {
         unmatched: false,
         ancestor: true,
         descendant: false,
+        params: {},
       })
       expect(Route0.create('/prefix/:x/some').getLocation('/prefix/xxx/some/extra/path')).toMatchObject({
         known: true,
@@ -967,6 +968,7 @@ describe('getLocation', () => {
         unmatched: false,
         ancestor: true,
         descendant: false,
+        params: { x: 'xxx' },
       })
       expect(Route0.create('/:y/:x/some').getLocation('/prefix/xxx/some/extra/path')).toMatchObject({
         known: true,
@@ -974,6 +976,7 @@ describe('getLocation', () => {
         unmatched: false,
         ancestor: true,
         descendant: false,
+        params: { y: 'prefix', x: 'xxx' },
       })
     })
 
@@ -984,6 +987,7 @@ describe('getLocation', () => {
         unmatched: false,
         ancestor: false,
         descendant: true,
+        params: {},
       })
       expect(Route0.create('/prefix/some/extra/:id').getLocation('/prefix/some')).toMatchObject({
         known: true,
@@ -991,6 +995,7 @@ describe('getLocation', () => {
         unmatched: false,
         ancestor: false,
         descendant: true,
+        params: {},
       })
       expect(Route0.create('/:prefix/some/extra/:id').getLocation('/prefix/some')).toMatchObject({
         known: true,
@@ -998,6 +1003,7 @@ describe('getLocation', () => {
         unmatched: false,
         ancestor: false,
         descendant: true,
+        params: { prefix: 'prefix' },
       })
     })
 
@@ -1280,6 +1286,13 @@ describe('getLocation', () => {
       expect(loc.exact).toBe(true)
       expect(loc.route).toBe('/b/:c')
     })
+
+    it('any RoutesPretty type suitable to any RoutesPretty stype', () => {
+      Routes.create({
+        home: '/',
+        v: '/b',
+      }) satisfies RoutesPretty
+    })
   })
 })
 

package/src/index.ts

@@ -719,19 +719,20 @@ export class Route0<TDefinition extends string> {
     const exactRe = new RegExp(`^${this.getRegexBaseString()}$`)
     const ancestorRe = new RegExp(`^${this.getRegexBaseString()}(?:/.*)?$`) // route matches the beginning of the URL (may have more)
     const exactMatch = pathname.match(exactRe)
+    const ancestorMatch = pathname.match(ancestorRe)
+    const exact = !!exactMatch
+    const ancestor = !exact && !!ancestorMatch
 
-    // Fill params only for exact match (keeps behavior predictable)
-    if (exactMatch) {
-      const values = exactMatch.slice(1)
+    // Parse params for exact and ancestor matches.
+    const paramsMatch = exactMatch || (ancestor ? ancestorMatch : null)
+    if (paramsMatch) {
+      const values = paramsMatch.slice(1, 1 + paramNames.length)
       const params = Object.fromEntries(paramNames.map((n, i) => [n, decodeURIComponent(values[i] ?? '')]))
       location.params = params
     } else {
       location.params = {}
     }
 
-    const exact = !!exactMatch
-    const ancestor = !exact && ancestorRe.test(pathname)
-
     // "descendant": the URL is a prefix of the route definition (params match any single segment)
     const getParts = (path: string) => (path === '/' ? ['/'] : path.split('/').filter(Boolean))
     const defParts = getParts(def)
@@ -758,6 +759,21 @@ export class Route0<TDefinition extends string> {
     const descendant = !exact && isPrefix
     const unmatched = !exact && !ancestor && !descendant
 
+    // For descendant matches, include only params that are already determined
+    // by the current (shorter) pathname prefix.
+    if (descendant) {
+      const descendantParams: Record<string, string> = {}
+      for (let i = 0; i < pathParts.length; i++) {
+        const defPart = defParts[i]
+        const pathPart = pathParts[i]
+        if (!defPart || !pathPart) continue
+        if (defPart.startsWith(':')) {
+          descendantParams[defPart.slice(1)] = decodeURIComponent(pathPart)
+        }
+      }
+      location.params = descendantParams
+    }
+
     return {
       ...location,
       known: true,
@@ -992,7 +1008,7 @@ export class Route0<TDefinition extends string> {
  * `Routes.create()` accepts either plain string definitions or route objects
  * and returns a "pretty" object with direct route access + helper methods under `._`.
  */
-export class Routes<const T extends RoutesRecord = RoutesRecord> {
+export class Routes<const T extends RoutesRecord = any> {
   _routes: RoutesRecordHydrated<T>
   _pathsOrdering: string[]
   _keysOrdering: string[]
@@ -1178,27 +1194,24 @@ export type RouteConfigInput = {
 /** User-provided routes map (plain definitions or route instances). */
 export type RoutesRecord = Record<string, AnyRoute | string>
 /** Same as `RoutesRecord` but all values normalized to callable routes. */
-export type RoutesRecordHydrated<TRoutesRecord extends RoutesRecord = RoutesRecord> = {
+export type RoutesRecordHydrated<TRoutesRecord extends RoutesRecord = any> = {
   [K in keyof TRoutesRecord]: CallableRoute<TRoutesRecord[K]>
 }
-/** Public shape returned by `Routes.create()`. */
-export type RoutesPretty<TRoutesRecord extends RoutesRecord = RoutesRecord> = RoutesRecordHydrated<TRoutesRecord> &
+/** Public shape returned by `Routes.create()`. Default `any` so `satisfies RoutesPretty` accepts any created routes. */
+export type RoutesPretty<TRoutesRecord extends RoutesRecord = any> = RoutesRecordHydrated<TRoutesRecord> &
   Omit<
     Routes<TRoutesRecord>,
     '_routes' | '_getLocation' | '_override' | '_pathsOrdering' | '_keysOrdering' | '_ordered'
   >
-export type ExtractRoutesKeys<TRoutes extends RoutesPretty<any> | RoutesRecord> =
-  TRoutes extends RoutesPretty<any>
-    ? Extract<keyof TRoutes['_']['routes'], string>
-    : TRoutes extends RoutesRecord
-      ? Extract<keyof TRoutes, string>
-      : never
-export type ExtractRoute<TRoutes extends RoutesPretty<any> | RoutesRecord, TKey extends ExtractRoutesKeys<TRoutes>> =
-  TRoutes extends RoutesPretty<any>
-    ? TRoutes['_']['routes'][TKey]
-    : TRoutes extends RoutesRecord
-      ? TRoutes[TKey]
-      : never
+export type ExtractRoutesKeys<TRoutes extends RoutesPretty | RoutesRecord> = TRoutes extends RoutesPretty
+  ? Extract<keyof TRoutes['_']['routes'], string>
+  : TRoutes extends RoutesRecord
+    ? Extract<keyof TRoutes, string>
+    : never
+export type ExtractRoute<
+  TRoutes extends RoutesPretty | RoutesRecord,
+  TKey extends ExtractRoutesKeys<TRoutes>,
+> = TRoutes extends RoutesPretty ? TRoutes['_']['routes'][TKey] : TRoutes extends RoutesRecord ? TRoutes[TKey] : never
 
 // public utils
 
@@ -1414,7 +1427,7 @@ export type UnmatchedLocationState<TRoute extends AnyRoute | string = AnyRoute |
   known: true
   route: Definition<TRoute>
   params: Record<never, never>
-  searchParams: LooseSearchOutput<TRoute>
+  searchParams: Record<string, string | undefined>
   exact: false
   ancestor: false
   descendant: false
@@ -1441,7 +1454,7 @@ export type ExactLocation<TRoute extends AnyRoute | string = AnyRoute | string>
 export type AncestorLocationState<TRoute extends AnyRoute | string = AnyRoute | string> = {
   known: true
   route: Definition<TRoute>
-  params: Partial<ParamsOutput<TRoute>>
+  params: ParamsOutput<TRoute>
   searchParams: LooseSearchOutput<TRoute>
   exact: false
   ancestor: true
@@ -1451,11 +1464,11 @@ export type AncestorLocationState<TRoute extends AnyRoute | string = AnyRoute |
 export type AncestorLocation<TRoute extends AnyRoute | string = AnyRoute | string> =
   IsAny<TRoute> extends true ? any : _GeneralLocation & AncestorLocationState<TRoute>
 
-/** Relaxed ancestor state variant for widened generic scenarios. */
+/** It is when route not match at all, but params match. */
 export type WeakAncestorLocationState<TRoute extends AnyRoute | string = AnyRoute | string> = {
   known: true
   route: Definition<TRoute>
-  params: Partial<ParamsOutput<TRoute>>
+  params: ParamsOutput<TRoute>
   searchParams: LooseSearchOutput<TRoute>
   exact: false
   ancestor: true
@@ -1469,7 +1482,7 @@ export type WeakAncestorLocation<TRoute extends AnyRoute | string = AnyRoute | s
 export type DescendantLocationState<TRoute extends AnyRoute | string = AnyRoute | string> = {
   known: true
   route: Definition<TRoute>
-  params: ParamsOutput<TRoute>
+  params: Partial<ParamsOutput<TRoute>>
   searchParams: LooseSearchOutput<TRoute>
   exact: false
   ancestor: false
@@ -1479,11 +1492,11 @@ export type DescendantLocationState<TRoute extends AnyRoute | string = AnyRoute
 export type DescendantLocation<TRoute extends AnyRoute | string = AnyRoute | string> =
   IsAny<TRoute> extends true ? any : _GeneralLocation & DescendantLocationState
 
-/** Relaxed descendant state variant for widened generic scenarios. */
+/** It is when route not match at all, but params partially match. */
 export type WeakDescendantLocationState<TRoute extends AnyRoute | string = AnyRoute | string> = {
   known: true
   route: Definition<TRoute>
-  params: ParamsOutput<TRoute>
+  params: Partial<ParamsOutput<TRoute>>
   searchParams: LooseSearchOutput<TRoute>
   exact: false
   ancestor: false