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

package/build/types/index.d.ts

@@ -55,6 +55,7 @@ declare function replaceEqualDeep(prev: any, next: any): any;
 declare function last<T>(arr: T[]): T | undefined;
 declare function warning(cond: any, message: string): cond is true;
 declare function functionalUpdate<TResult>(updater: Updater<TResult>, previous: TResult): TResult;
+declare function pick<T, K extends keyof T>(parent: T, keys: K[]): Pick<T, K>;
 
 interface LocationState {
 }
@@ -145,7 +146,6 @@ interface RouterState {
     location: Location;
     matches: RouteMatch[];
     lastUpdated: number;
-    loaderData: unknown;
     currentAction?: ActionState;
     latestAction?: ActionState;
     actions: Record<string, Action>;
@@ -186,6 +186,11 @@ interface MatchRouteOptions {
     pending: boolean;
     caseSensitive?: boolean;
 }
+interface DehydratedRouterState extends Pick<RouterState, 'status' | 'location' | 'lastUpdated'> {
+    matches: DehydratedRouteMatch[];
+}
+interface DehydratedRouteMatch extends Pick<RouteMatch<any, any>, 'matchId' | 'status' | 'routeLoaderData' | 'loaderData' | 'isInvalid' | 'invalidAt'> {
+}
 interface Router<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>> {
     history: BrowserHistory | MemoryHistory | HashHistory;
     options: PickAsRequired<RouterOptions<TRouteConfig>, 'stringifySearch' | 'parseSearch'>;
@@ -241,6 +246,8 @@ interface Router<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInf
     navigate: <TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'>(opts: NavigateOptionsAbsolute<TAllRouteInfo, TFrom, TTo>) => Promise<void>;
     matchRoute: <TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'>(matchLocation: ToOptions<TAllRouteInfo, TFrom, TTo>, opts?: MatchRouteOptions) => boolean;
     buildLink: <TFrom extends ValidFromPath<TAllRouteInfo> = '/', TTo extends string = '.'>(opts: LinkOptions<TAllRouteInfo, TFrom, TTo>) => LinkInfo;
+    dehydrateState: () => DehydratedRouterState;
+    hydrateState: (state: DehydratedRouterState) => void;
     __: {
         buildRouteTree: (routeConfig: RouteConfig) => Route<TAllRouteInfo, AnyRouteInfo>;
         parseLocation: (location: History['location'], previousLocation?: Location) => Location;
@@ -609,4 +616,4 @@ declare const defaultStringifySearch: (search: Record<string, any>) => string;
 declare function parseSearchWith(parser: (str: string) => any): (searchStr: string) => AnySearchSchema;
 declare function stringifySearchWith(stringify: (search: any) => string): (search: Record<string, any>) => string;
 
-export { Action, ActionFn, ActionState, AllRouteInfo, AnyAllRouteInfo, AnyLoaderData, AnyPathParams, AnyRoute, AnyRouteConfig, AnyRouteConfigWithChildren, AnyRouteInfo, AnySearchSchema, BuildNextOptions, CheckId, CheckIdError, CheckPath, CheckPathError, CheckRelativePath, DeepAwaited, DefaultAllRouteInfo, DefinedPathParamWarning, Expand, FilterRoutesFn, FrameworkGenerics, FromLocation, GetFrameworkGeneric, IsAny, IsAnyBoolean, IsKnown, LinkInfo, LinkOptions, ListenerFn, Loader, LoaderContext, LoaderFn, LoaderState, Location, LocationState, MatchCacheEntry, MatchLocation, MatchRouteOptions, NavigateOptionsAbsolute, NoInfer, ParentParams, ParsePathParams, ParseRouteConfig, PathParamMask, PendingState, PickAsPartial, PickAsRequired, PickExclude, PickExtra, PickExtract, PickRequired, PickUnsafe, RelativeToPathAutoComplete, ResolveRelativePath, RootRouteId, Route, RouteConfig, RouteConfigRoute, RouteInfo, RouteInfoById, RouteInfoByPath, RouteMatch, RouteMeta, RouteOptions, Router, RouterOptions, RouterState, RoutesById, RoutesInfoInner, SearchFilter, SearchParser, SearchSchemaValidator, SearchSchemaValidatorFn, SearchSchemaValidatorObj, SearchSerializer, Segment, Split, Timeout, ToIdOption, ToOptions, ToPathOption, UnloaderFn, Updater, ValidFromPath, ValueKeys, Values, cascadeLoaderData, cleanPath, createRoute, createRouteConfig, createRouteMatch, createRouter, decode, defaultParseSearch, defaultStringifySearch, encode, functionalUpdate, interpolatePath, joinPaths, last, matchByPath, matchPathname, parsePathname, parseSearchWith, replaceEqualDeep, resolvePath, rootRouteId, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, warning };
+export { Action, ActionFn, ActionState, AllRouteInfo, AnyAllRouteInfo, AnyLoaderData, AnyPathParams, AnyRoute, AnyRouteConfig, AnyRouteConfigWithChildren, AnyRouteInfo, AnySearchSchema, BuildNextOptions, CheckId, CheckIdError, CheckPath, CheckPathError, CheckRelativePath, DeepAwaited, DefaultAllRouteInfo, DefinedPathParamWarning, Expand, FilterRoutesFn, FrameworkGenerics, FromLocation, GetFrameworkGeneric, IsAny, IsAnyBoolean, IsKnown, LinkInfo, LinkOptions, ListenerFn, Loader, LoaderContext, LoaderFn, LoaderState, Location, LocationState, MatchCacheEntry, MatchLocation, MatchRouteOptions, NavigateOptionsAbsolute, NoInfer, ParentParams, ParsePathParams, ParseRouteConfig, PathParamMask, PendingState, PickAsPartial, PickAsRequired, PickExclude, PickExtra, PickExtract, PickRequired, PickUnsafe, RelativeToPathAutoComplete, ResolveRelativePath, RootRouteId, Route, RouteConfig, RouteConfigRoute, RouteInfo, RouteInfoById, RouteInfoByPath, RouteMatch, RouteMeta, RouteOptions, Router, RouterOptions, RouterState, RoutesById, RoutesInfoInner, SearchFilter, SearchParser, SearchSchemaValidator, SearchSchemaValidatorFn, SearchSchemaValidatorObj, SearchSerializer, Segment, Split, Timeout, ToIdOption, ToOptions, ToPathOption, UnloaderFn, Updater, ValidFromPath, ValueKeys, Values, cascadeLoaderData, cleanPath, createRoute, createRouteConfig, createRouteMatch, createRouter, decode, defaultParseSearch, defaultStringifySearch, encode, functionalUpdate, interpolatePath, joinPaths, last, matchByPath, matchPathname, parsePathname, parseSearchWith, pick, replaceEqualDeep, resolvePath, rootRouteId, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, warning };

package/build/umd/index.development.js

@@ -930,6 +930,11 @@
 
     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 @@
         matches: [],
         actions: {},
         loaders: {},
-        loaderData: {},
         lastUpdated: Date.now(),
         isFetching: false,
         isPreloading: false
@@ -1748,6 +1752,26 @@
         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 @@
 
         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 @@
         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 @@
 
         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 @@
           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 @@
         }
       }
     };
-    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);
@@ -2469,6 +2498,7 @@
   exports.matchPathname = matchPathname;
   exports.parsePathname = parsePathname;
   exports.parseSearchWith = parseSearchWith;
+  exports.pick = pick;
   exports.replaceEqualDeep = replaceEqualDeep;
   exports.resolvePath = resolvePath;
   exports.rootRouteId = rootRouteId;