@tanstack/router-core 0.0.1-beta.50 → 0.0.1-beta.51

package/build/types/index.d.ts

@@ -133,7 +133,7 @@ interface RouterOptions<TRouteConfig extends AnyRouteConfig, TRouterContext> {
     routeConfig?: TRouteConfig;
     basepath?: string;
     useServerData?: boolean;
-    createRouter?: (router: AnyRouter) => void;
+    Router?: (router: AnyRouter) => void;
     createRoute?: (opts: {
         route: AnyRoute;
         router: AnyRouter;
@@ -221,7 +221,7 @@ interface DehydratedRouter<TRouterContext = unknown> {
 }
 type MatchCache = Record<string, MatchCacheEntry>;
 interface DehydratedRouteMatch {
-    matchId: string;
+    id: string;
     state: Pick<RouteMatchStore<any, any>, 'status' | 'routeLoaderData' | 'invalid' | 'invalidAt'>;
 }
 interface RouterContext {
@@ -316,7 +316,7 @@ declare class RouteMatch<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRoute
         search: TRouteInfo['fullSearchSchema'];
     }) => void);
     constructor(router: AnyRouter, route: Route<TAllRouteInfo, TRouteInfo>, opts: {
-        matchId: string;
+        id: string;
         params: TRouteInfo['allParams'];
         pathname: string;
     });

package/build/umd/index.development.js

@@ -678,7 +678,7 @@
         Object.assign(this, {
           route,
           router,
-          matchId: opts.matchId,
+          id: opts.id,
           pathname: opts.pathname,
           params: opts.params,
           store: createStore({
@@ -972,13 +972,12 @@
           parseSearch: options?.parseSearch ?? defaultParseSearch,
           fetchServerDataFn: options?.fetchServerDataFn ?? defaultFetchServerDataFn
         };
-        this.history = this.options?.history ?? createBrowserHistory();
         this.store = createStore(getInitialRouterState());
         this.basepath = '';
         this.update(options);
 
         // Allow frameworks to hook into the router creation
-        this.options.createRouter?.(this);
+        this.options.Router?.(this);
       }
       reset = () => {
         this.store.setState(s => Object.assign(s, getInitialRouterState()));
@@ -1017,13 +1016,14 @@
         return () => {};
       };
       update = opts => {
-        if (!this.store.state.latestLocation) {
+        Object.assign(this.options, opts);
+        if (!this.history || this.options.history && this.options.history !== this.history) {
+          this.history = this.options?.history ?? isServer ? createMemoryHistory() : createBrowserHistory();
           this.store.setState(s => {
             s.latestLocation = this.#parseLocation();
             s.currentLocation = s.latestLocation;
           });
         }
-        Object.assign(this.options, opts);
         const {
           basepath,
           routeConfig
@@ -1248,7 +1248,7 @@
             const interpolatedPath = interpolatePath(foundRoute.path, params);
             const matchId = interpolatePath(foundRoute.id, params, true);
             const match = existingMatches.find(d => d.id === matchId) || this.store.state.matchCache[matchId]?.match || new RouteMatch(this, foundRoute, {
-              matchId,
+              id: matchId,
               params,
               pathname: joinPaths([this.basepath, interpolatedPath])
             });
@@ -1320,10 +1320,11 @@
 
           // TODO: batch requests when possible
 
-          return this.options.fetchServerDataFn({
+          const res = await this.options.fetchServerDataFn({
             router: this,
             routeMatch
           });
+          return res;
         }
       };
       invalidateRoute = async opts => {
@@ -1514,7 +1515,7 @@
           state: {
             ...pick(this.store.state, ['latestLocation', 'currentLocation', 'status', 'lastUpdated']),
             currentMatches: this.store.state.currentMatches.map(match => ({
-              matchId: match.id,
+              id: match.id,
               state: {
                 ...pick(match.store.state, ['status', 'routeLoaderData', 'invalidAt', 'invalid'])
               }
@@ -1534,7 +1535,7 @@
           });
           currentMatches.forEach((match, index) => {
             const dehydratedMatch = dehydratedRouter.state.currentMatches[index];
-            invariant(dehydratedMatch && dehydratedMatch.matchId === match.id, 'Oh no! There was a hydration mismatch when attempting to rethis.store the state of the router! 😬');
+            invariant(dehydratedMatch && dehydratedMatch.id === match.id, 'Oh no! There was a hydration mismatch when attempting to rethis.store the state of the router! 😬');
             Object.assign(match, dehydratedMatch);
           });
           currentMatches.forEach(match => match.__validate());
@@ -1681,7 +1682,9 @@
           id,
           ...next.state
         });
-        this.load(this.#parseLocation(this.store.state.latestLocation));
+
+        // this.load(this.#parseLocation(this.store.state.latestLocation))
+
         return this.navigationPromise = new Promise(resolve => {
           const previousNavigationResolve = this.resolveNavigation;
           this.resolveNavigation = () => {
@@ -1723,7 +1726,7 @@
       });
     }
 
-    // createRouterAction is a constrained identify function that takes options: key, action, onSuccess, onError, onSettled, etc
+    // RouterAction is a constrained identify function that takes options: key, action, onSuccess, onError, onSettled, etc
     function createAction(options) {
       const store = createStore({
         submissions: []