@tanstack/router-core 0.0.1-beta.52 → 0.0.1-beta.54

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.52",
+  "version": "0.0.1-beta.54",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",

package/src/history.ts

@@ -2,6 +2,8 @@
 // This implementation attempts to be more lightweight by
 // making assumptions about the way TanStack Router works
 
+import { match } from 'assert'
+
 export interface RouterHistory {
   location: RouterLocation
   listen: (cb: () => void) => () => void
@@ -177,11 +179,19 @@ export function createMemoryHistory(
 function parseLocation(href: string, state: any): RouterLocation {
   let hashIndex = href.indexOf('#')
   let searchIndex = href.indexOf('?')
-  const pathEnd = Math.min(hashIndex, searchIndex)
 
   return {
     href,
-    pathname: pathEnd > -1 ? href.substring(0, pathEnd) : href,
+    pathname: href.substring(
+      0,
+      hashIndex > 0
+        ? searchIndex > 0
+          ? Math.min(hashIndex, searchIndex)
+          : hashIndex
+        : searchIndex > 0
+        ? searchIndex
+        : href.length,
+    ),
     hash: hashIndex > -1 ? href.substring(hashIndex, searchIndex) : '',
     search: searchIndex > -1 ? href.substring(searchIndex) : '',
     state,

package/src/router.ts

@@ -820,7 +820,12 @@ export class Router<
     }
   }
 
-  invalidateRoute = async (opts: MatchLocation) => {
+  invalidateRoute = async <
+    TFrom extends ValidFromPath<TAllRouteInfo> = '/',
+    TTo extends string = '.',
+  >(
+    opts: ToOptions<TAllRouteInfo, TFrom, TTo>,
+  ) => {
     const next = this.buildNext(opts)
     const unloadedMatchIds = this.matchRoutes(next.pathname).map((d) => d.id)
 
@@ -865,8 +870,7 @@ export class Router<
     // If this `to` is a valid external URL, return
     // null for LinkUtils
     const toString = String(to)
-    const fromString = String(from)
-
+    const fromString = typeof from === 'undefined' ? from : String(from)
     let isExternal
 
     try {
@@ -1010,7 +1014,7 @@ export class Router<
       ) {
         e.preventDefault()
         if (pathIsEqual && !search && !hash) {
-          this.invalidateRoute(nextOpts)
+          this.invalidateRoute(nextOpts as any)
         }
 
         // All is well? Navigate!