@tanstack/react-router 0.0.1-beta.284 → 0.0.1-beta.286

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.284",
+  "version": "0.0.1-beta.286",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "@tanstack/store": "^0.1.3",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "0.0.1-beta.284"
+    "@tanstack/history": "0.0.1-beta.286"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/Matches.tsx

@@ -289,6 +289,12 @@ function getRenderedMatches(state: RouterState) {
     : state.matches
 }
 
+function removeUnderscores(s?: string) {
+  if (s === rootRouteId) return s
+
+  return s?.replace(/(^_|_$)/, '').replace(/(\/_|_\/)/, '/')
+}
+
 export function useMatch<
   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>,
@@ -309,11 +315,18 @@ export function useMatch<
 
   const matchRouteId = (() => {
     const matches = getRenderedMatches(router.state)
-    const match = opts?.from
-      ? matches.find((d) => d.routeId === opts?.from)
-      : matches.find((d) => d.id === nearestMatchId)
-    return match!.routeId
-  })()
+
+    if (!opts.from) {
+      return matches.find((d) => d.id === nearestMatchId)
+    }
+
+    const from = removeUnderscores(opts.from)
+
+    return (
+      matches.find((d) => d.routeId === from) ??
+      matches.find((d) => d.routeId === from?.replace(/\/$/, ''))
+    )
+  })()?.routeId
 
   if (opts?.strict ?? true) {
     invariant(

package/src/link.tsx

@@ -172,11 +172,9 @@ export type SearchParamOptions<
   TFromSearchEnsured = '/' extends TFrom
     ? FullSearchSchema<TRouteTree>
     : Expand<
-        UnionToIntersection<
           PickRequired<
             RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']
           >
-        >
       >,
   TFromSearchOptional = Omit<
     FullSearchSchema<TRouteTree>,

package/src/routeInfo.ts

@@ -1,5 +1,5 @@
 import { AnyRoute, Route } from './route'
-import { Expand, UnionToIntersection } from './utils'
+import { Expand, UnionToIntersection, UnionToTuple } from './utils'
 
 export type ParseRoute<TRouteTree extends AnyRoute> =
   | TRouteTree
@@ -59,9 +59,23 @@ export type RoutePaths<TRouteTree extends AnyRoute> =
   | ParseRoute<TRouteTree>['fullPath']
   | '/'
 
+type UnionizeCollisions<T, U> = {
+  [P in keyof T & keyof U]: T[P] extends U[P] ? T[P] : T[P] | U[P]
+}
+type Reducer<T, U, C = UnionizeCollisions<T, U>> = C &
+  Omit<T, keyof C> &
+  Omit<U, keyof C>
+
+type Reduce<T extends any[], Result = unknown> = T extends [
+  infer First,
+  ...infer Rest,
+]
+  ? Reduce<Rest, Reducer<Result, First>>
+  : Result
+
 export type FullSearchSchema<TRouteTree extends AnyRoute> = Partial<
   Expand<
-    UnionToIntersection<ParseRoute<TRouteTree>['types']['fullSearchSchema']>
+    Reduce<UnionToTuple<ParseRoute<TRouteTree>['types']['fullSearchSchema']>>
   >
 >
 

package/src/utils.ts

@@ -133,6 +133,16 @@ export type PickExclude<T, U> = {
   [K in keyof T as T[K] extends U ? never : K]: T[K]
 }
 
+// from https://github.com/type-challenges/type-challenges/issues/737
+type LastInUnion<U> = UnionToIntersection<
+  U extends unknown ? (x: U) => 0 : never
+> extends (x: infer L) => 0
+  ? L
+  : never
+export type UnionToTuple<U, Last = LastInUnion<U>> = [U] extends [never]
+  ? []
+  : [...UnionToTuple<Exclude<U, Last>>, Last]
+
 //
 
 export const isServer = typeof document === 'undefined'