@tanstack/router-core 0.0.1-beta.4 → 0.0.1-beta.6

package/build/esm/index.js

@@ -930,6 +930,11 @@ function functionalUpdate(updater, previous) {
 
   return updater;
 }
+function pick(parent, keys) {
+  return keys.reduce((obj, key) => {
+    obj[key] = parent[key];
+  }, {});
+}
 
 function joinPaths(paths) {
   return cleanPath(paths.filter(Boolean).join('/'));
@@ -1725,7 +1730,6 @@ function createRouter(userOptions) {
       matches: [],
       actions: {},
       loaders: {},
-      loaderData: {},
       lastUpdated: Date.now(),
       isFetching: false,
       isPreloading: false
@@ -1748,6 +1752,26 @@ function createRouter(userOptions) {
       cascadeLoaderData(router.state.matches);
       router.listeners.forEach(listener => listener(router));
     },
+    dehydrateState: () => {
+      router.state;
+      return _extends({}, pick(router.state, ['status', 'location', 'lastUpdated']), {
+        matches: router.state.matches.map(match => pick(match, ['matchId', 'status', 'routeLoaderData', 'loaderData', 'isInvalid', 'invalidAt']))
+      });
+    },
+    hydrateState: dehydratedState => {
+      // Match the routes
+      const matches = router.matchRoutes(router.location.pathname, {
+        strictParseParams: true
+      });
+      router.state = _extends({}, router.state, dehydratedState, {
+        matches: matches.map(match => {
+          const dehydratedMatch = dehydratedState.matches.find(d => d.matchId === match.matchId);
+          invariant(dehydratedMatch, 'Oh no! Dehydrated route matches did not match the active state of the router 😬');
+          Object.assign(match, dehydratedMatch);
+          return match;
+        })
+      });
+    },
     mount: () => {
       const next = router.__.buildLocation({
         to: '.',
@@ -1759,11 +1783,11 @@ function createRouter(userOptions) {
 
       if (next.href !== router.location.href) {
         router.__.commitLocation(next, true);
-      } else {
-        router.loadLocation();
       }
 
-      const unsub = history.listen(event => {
+      router.loadLocation();
+      const unsub = router.history.listen(event => {
+        console.log(event.location);
         router.loadLocation(router.__.parseLocation(event.location, router.location));
       }); // addEventListener does not exist in React Native, but window does
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -1785,6 +1809,17 @@ function createRouter(userOptions) {
       router.loadLocation();
     },
     update: opts => {
+      const newHistory = (opts == null ? void 0 : opts.history) !== router.history;
+
+      if (!router.location || newHistory) {
+        if (opts != null && opts.history) {
+          router.history = opts.history;
+        }
+
+        router.location = router.__.parseLocation(router.history.location);
+        router.state.location = router.location;
+      }
+
       Object.assign(router.options, opts);
       const {
         basepath,
@@ -1833,7 +1868,7 @@ function createRouter(userOptions) {
 
       router.cancelMatches(); // Match the routes
 
-      const matches = router.matchRoutes(location.pathname, {
+      const matches = router.matchRoutes(router.location.pathname, {
         strictParseParams: true
       });
       router.state = _extends({}, router.state, {
@@ -2296,11 +2331,7 @@ function createRouter(userOptions) {
         const recurseRoutes = (routeConfigs, parent) => {
           return routeConfigs.map(routeConfig => {
             const routeOptions = routeConfig.options;
-            const route = createRoute(routeConfig, routeOptions, parent, router); // {
-            //   pendingMs: routeOptions.pendingMs ?? router.defaultPendingMs,
-            //   pendingMinMs: routeOptions.pendingMinMs ?? router.defaultPendingMinMs,
-            // }
-
+            const route = createRoute(routeConfig, routeOptions, parent, router);
             const existingRoute = router.routesById[route.routeId];
 
             if (existingRoute) {
@@ -2435,8 +2466,6 @@ function createRouter(userOptions) {
       }
     }
   };
-  router.location = router.__.parseLocation(history.location);
-  router.state.location = router.location;
   router.update(userOptions); // Allow frameworks to hook into the router creation
 
   router.options.createRouter == null ? void 0 : router.options.createRouter(router);
@@ -2447,5 +2476,5 @@ function isCtrlEvent(e) {
   return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
 }
 
-export { cascadeLoaderData, cleanPath, createBrowserHistory, createHashHistory, createMemoryHistory, createRoute, createRouteConfig, createRouteMatch, createRouter, decode, defaultParseSearch, defaultStringifySearch, encode, functionalUpdate, interpolatePath, invariant, joinPaths, last, matchByPath, matchPathname, parsePathname, parseSearchWith, replaceEqualDeep, resolvePath, rootRouteId, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, warning };
+export { cascadeLoaderData, cleanPath, createBrowserHistory, createHashHistory, createMemoryHistory, createRoute, createRouteConfig, createRouteMatch, createRouter, decode, defaultParseSearch, defaultStringifySearch, encode, functionalUpdate, interpolatePath, invariant, joinPaths, last, matchByPath, matchPathname, parsePathname, parseSearchWith, pick, replaceEqualDeep, resolvePath, rootRouteId, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, warning };
 //# sourceMappingURL=index.js.map