react-router 0.0.0-experimental-aecfb0db1 → 0.0.0-experimental-5bbc45fb6

package/dist/development/{chunk-RXFCVJK2.mjs → chunk-EKICUOCX.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-aecfb0db1
+ * react-router v0.0.0-experimental-5bbc45fb6
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5502,25 +5502,11 @@ function RouterProvider({
         viewTransitionOpts == null || isViewTransitionAvailable,
         "You provided the `viewTransition` option to a router update, but you do not appear to be running in a DOM environment as `window.startViewTransition` is not available."
       );
-      const resetTransition = () => {
-        setRenderDfd(void 0);
-        setTransition(void 0);
-        setPendingState(void 0);
-        setVtContext({ isTransitioning: false });
-      };
       if (!viewTransitionOpts || !isViewTransitionAvailable) {
-        renderDfd?.resolve();
-        transition?.skipTransition();
         if (reactDomFlushSyncImpl && flushSync) {
-          reactDomFlushSyncImpl(() => {
-            setStateImpl(newState);
-            resetTransition();
-          });
+          reactDomFlushSyncImpl(() => setStateImpl(newState));
         } else {
-          React3.startTransition(() => {
-            setStateImpl(newState);
-            resetTransition();
-          });
+          React3.startTransition(() => setStateImpl(newState));
         }
         return;
       }
@@ -5541,7 +5527,12 @@ function RouterProvider({
           reactDomFlushSyncImpl(() => setStateImpl(newState));
         });
         t.finished.finally(() => {
-          reactDomFlushSyncImpl(() => resetTransition());
+          reactDomFlushSyncImpl(() => {
+            setRenderDfd(void 0);
+            setTransition(void 0);
+            setPendingState(void 0);
+            setVtContext({ isTransitioning: false });
+          });
         });
         reactDomFlushSyncImpl(() => setTransition(t));
         return;
@@ -8649,7 +8640,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-aecfb0db1";
+    window.__reactRouterVersion = "0.0.0-experimental-5bbc45fb6";
   }
 } catch (e) {
 }

package/dist/development/dom-export.d.mts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './lib-BJBhVBWN.mjs';
-import { R as RouterInit } from './route-data-BmDen1H_.mjs';
+import { R as RouterProviderProps$1 } from './lib-DOOHL1pK.mjs';
+import { R as RouterInit } from './route-data-BwJdBC92.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-aecfb0db1
+ * react-router v0.0.0-experimental-5bbc45fb6
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-aecfb0db1
+ * react-router v0.0.0-experimental-5bbc45fb6
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-RXFCVJK2.mjs";
+} from "./chunk-EKICUOCX.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/development/index.d.mts

@@ -1,11 +1,12 @@
-import { a as Router, b as RouteModules, D as DataStrategyFunction, T as To, c as RelativeRoutingType, L as Location, A as Action, P as ParamParseKey, d as Path, e as PathPattern, f as PathMatch, N as NavigateOptions, g as Params$1, h as RouteObject, i as Navigation, j as RevalidationState, U as UIMatch, S as SerializeFrom, B as BlockerFunction, k as Blocker, l as StaticHandlerContext, m as StaticHandler, F as FutureConfig, C as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, u as unstable_InitialContext, n as IndexRouteObject, o as LoaderFunction, p as ActionFunction, M as MetaFunction, q as LinksFunction, r as NonIndexRouteObject, s as MiddlewareEnabled, t as AppLoadContext, E as Equal, v as RouterState, w as PatchRoutesOnNavigationFunction, x as DataRouteObject, y as ClientLoaderFunction } from './route-data-BmDen1H_.mjs';
-export { W as ActionFunctionArgs, av as ClientActionFunction, aw as ClientActionFunctionArgs, ax as ClientLoaderFunctionArgs, ar as DataRouteMatch, X as DataStrategyFunctionArgs, Y as DataStrategyMatch, Z as DataStrategyResult, $ as ErrorResponse, J as Fetcher, a0 as FormEncType, a1 as FormMethod, aF as Future, G as GetScrollPositionFunction, z as GetScrollRestorationKeyFunction, a2 as HTMLFormMethod, ay as HeadersArgs, az as HeadersFunction, aD as HtmlLinkDescriptor, ah as IDLE_BLOCKER, ag as IDLE_FETCHER, af as IDLE_NAVIGATION, a3 as LazyRouteFunction, aE as LinkDescriptor, a4 as LoaderFunctionArgs, aA as MetaArgs, aB as MetaDescriptor, K as NavigationStates, as as Navigator, aC as PageLinkDescriptor, at as PatchRoutesOnNavigationFunctionArgs, a6 as PathParam, a7 as RedirectFunction, au as RouteMatch, V as RouterFetchOptions, R as RouterInit, Q as RouterNavigateOptions, O as RouterSubscriber, a9 as ShouldRevalidateFunction, aa as ShouldRevalidateFunctionArgs, aL as UNSAFE_DataRouterContext, aM as UNSAFE_DataRouterStateContext, _ as UNSAFE_DataWithResponseInit, aK as UNSAFE_ErrorResponseImpl, aN as UNSAFE_FetchersContext, aO as UNSAFE_LocationContext, aP as UNSAFE_NavigationContext, aQ as UNSAFE_RouteContext, aR as UNSAFE_ViewTransitionContext, aH as UNSAFE_createBrowserHistory, aJ as UNSAFE_createRouter, aI as UNSAFE_invariant, ad as createPath, ai as data, aj as generatePath, ak as isRouteErrorResponse, al as matchPath, am as matchRoutes, ae as parsePath, an as redirect, ao as redirectDocument, ap as replace, aq as resolvePath, a5 as unstable_MiddlewareFunction, a8 as unstable_RouterContext, ac as unstable_RouterContextProvider, aG as unstable_SerializesTo, ab as unstable_createContext } from './route-data-BmDen1H_.mjs';
-import { A as AssetsManifest, E as EntryContext, F as FutureConfig$1, S as ServerBuild } from './lib-BJBhVBWN.mjs';
-export { f as Await, a as AwaitProps, Q as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, v as FetcherFormProps, C as FetcherSubmitFunction, a6 as FetcherSubmitOptions, G as FetcherWithComponents, X as Form, w as FormProps, ah as HandleDataRequestFunction, ai as HandleDocumentRequestFunction, aj as HandleErrorFunction, T as HashRouter, H as HashRouterProps, q as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, U as Link, s as LinkProps, ad as Links, g as MemoryRouter, M as MemoryRouterOpts, b as MemoryRouterProps, ac as Meta, W as NavLink, t as NavLinkProps, u as NavLinkRenderProps, h as Navigate, N as NavigateProps, i as Outlet, O as OutletProps, a7 as ParamKeyValuePair, P as PathRouteProps, af as PrefetchPageLinks, j as Route, c as RouteProps, k as Router, d as RouterProps, l as RouterProvider, R as RouterProviderProps, m as Routes, e as RoutesProps, ae as Scripts, ag as ScriptsProps, Y as ScrollRestoration, x as ScrollRestorationProps, ak as ServerEntryModule, y as SetURLSearchParams, z as SubmitFunction, a8 as SubmitOptions, aa as SubmitTarget, an as UNSAFE_FrameworkContext, ao as UNSAFE_createClientRoutes, ap as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, al as UNSAFE_hydrationRouteProperties, am as UNSAFE_mapRouteProperties, aq as UNSAFE_shouldHydrateRouteLoader, ar as UNSAFE_useScrollRestoration, a9 as URLSearchParamsInit, J as createBrowserRouter, K as createHashRouter, n as createMemoryRouter, o as createRoutesFromChildren, p as createRoutesFromElements, ab as createSearchParams, r as renderMatches, V as unstable_HistoryRouter, a4 as unstable_usePrompt, a3 as useBeforeUnload, a1 as useFetcher, a2 as useFetchers, a0 as useFormAction, Z as useLinkClickHandler, _ as useSearchParams, $ as useSubmit, a5 as useViewTransitionState } from './lib-BJBhVBWN.mjs';
+import { a as Router, b as RouteModules, D as DataStrategyFunction, T as To, c as RelativeRoutingType, L as Location, A as Action, P as ParamParseKey, d as Path, e as PathPattern, f as PathMatch, N as NavigateOptions, g as Params, h as RouteObject, i as Navigation, j as RevalidationState, U as UIMatch, S as SerializeFrom, B as BlockerFunction, k as Blocker, l as StaticHandlerContext, m as StaticHandler, F as FutureConfig, C as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, u as unstable_InitialContext, n as IndexRouteObject, o as LoaderFunction, p as ActionFunction, M as MetaFunction, q as LinksFunction, r as NonIndexRouteObject, s as MiddlewareEnabled, t as AppLoadContext, E as Equal, v as RouterState, w as PatchRoutesOnNavigationFunction, x as DataRouteObject, y as ClientLoaderFunction } from './route-data-BwJdBC92.mjs';
+export { W as ActionFunctionArgs, av as ClientActionFunction, aw as ClientActionFunctionArgs, ax as ClientLoaderFunctionArgs, ar as DataRouteMatch, X as DataStrategyFunctionArgs, Y as DataStrategyMatch, Z as DataStrategyResult, $ as ErrorResponse, J as Fetcher, a0 as FormEncType, a1 as FormMethod, aF as Future, G as GetScrollPositionFunction, z as GetScrollRestorationKeyFunction, a2 as HTMLFormMethod, ay as HeadersArgs, az as HeadersFunction, aD as HtmlLinkDescriptor, ah as IDLE_BLOCKER, ag as IDLE_FETCHER, af as IDLE_NAVIGATION, a3 as LazyRouteFunction, aE as LinkDescriptor, a4 as LoaderFunctionArgs, aA as MetaArgs, aB as MetaDescriptor, K as NavigationStates, as as Navigator, aC as PageLinkDescriptor, at as PatchRoutesOnNavigationFunctionArgs, a6 as PathParam, a7 as RedirectFunction, au as RouteMatch, V as RouterFetchOptions, R as RouterInit, Q as RouterNavigateOptions, O as RouterSubscriber, a9 as ShouldRevalidateFunction, aa as ShouldRevalidateFunctionArgs, aL as UNSAFE_DataRouterContext, aM as UNSAFE_DataRouterStateContext, _ as UNSAFE_DataWithResponseInit, aK as UNSAFE_ErrorResponseImpl, aN as UNSAFE_FetchersContext, aO as UNSAFE_LocationContext, aP as UNSAFE_NavigationContext, aQ as UNSAFE_RouteContext, aR as UNSAFE_ViewTransitionContext, aH as UNSAFE_createBrowserHistory, aJ as UNSAFE_createRouter, aI as UNSAFE_invariant, ad as createPath, ai as data, aj as generatePath, ak as isRouteErrorResponse, al as matchPath, am as matchRoutes, ae as parsePath, an as redirect, ao as redirectDocument, ap as replace, aq as resolvePath, a5 as unstable_MiddlewareFunction, a8 as unstable_RouterContext, ac as unstable_RouterContextProvider, aG as unstable_SerializesTo, ab as unstable_createContext } from './route-data-BwJdBC92.mjs';
+import { A as AssetsManifest, E as EntryContext, F as FutureConfig$1, S as ServerBuild } from './lib-DOOHL1pK.mjs';
+export { f as Await, a as AwaitProps, Q as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, v as FetcherFormProps, C as FetcherSubmitFunction, a6 as FetcherSubmitOptions, G as FetcherWithComponents, X as Form, w as FormProps, ah as HandleDataRequestFunction, ai as HandleDocumentRequestFunction, aj as HandleErrorFunction, T as HashRouter, H as HashRouterProps, q as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, U as Link, s as LinkProps, ad as Links, g as MemoryRouter, M as MemoryRouterOpts, b as MemoryRouterProps, ac as Meta, W as NavLink, t as NavLinkProps, u as NavLinkRenderProps, h as Navigate, N as NavigateProps, i as Outlet, O as OutletProps, a7 as ParamKeyValuePair, P as PathRouteProps, af as PrefetchPageLinks, j as Route, c as RouteProps, k as Router, d as RouterProps, l as RouterProvider, R as RouterProviderProps, m as Routes, e as RoutesProps, ae as Scripts, ag as ScriptsProps, Y as ScrollRestoration, x as ScrollRestorationProps, ak as ServerEntryModule, y as SetURLSearchParams, z as SubmitFunction, a8 as SubmitOptions, aa as SubmitTarget, an as UNSAFE_FrameworkContext, ao as UNSAFE_createClientRoutes, ap as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, al as UNSAFE_hydrationRouteProperties, am as UNSAFE_mapRouteProperties, aq as UNSAFE_shouldHydrateRouteLoader, ar as UNSAFE_useScrollRestoration, a9 as URLSearchParamsInit, J as createBrowserRouter, K as createHashRouter, n as createMemoryRouter, o as createRoutesFromChildren, p as createRoutesFromElements, ab as createSearchParams, r as renderMatches, V as unstable_HistoryRouter, a4 as unstable_usePrompt, a3 as useBeforeUnload, a1 as useFetcher, a2 as useFetchers, a0 as useFormAction, Z as useLinkClickHandler, _ as useSearchParams, $ as useSubmit, a5 as useViewTransitionState } from './lib-DOOHL1pK.mjs';
 import * as React from 'react';
 import { ReactElement } from 'react';
 import { ParseOptions, SerializeOptions } from 'cookie';
 export { ParseOptions as CookieParseOptions, SerializeOptions as CookieSerializeOptions } from 'cookie';
+import { R as Register } from './register-e9PGCFx1.mjs';
 
 declare const SingleFetchRedirectSymbol: unique symbol;
 declare function getTurboStreamSingleFetchDataStrategy(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, basename: string | undefined): DataStrategyFunction;
@@ -147,7 +148,7 @@ declare function useOutlet(context?: unknown): React.ReactElement | null;
  */
 declare function useParams<ParamsOrKey extends string | Record<string, string | undefined> = string>(): Readonly<[
     ParamsOrKey
-] extends [string] ? Params$1<ParamsOrKey> : Partial<ParamsOrKey>>;
+] extends [string] ? Params<ParamsOrKey> : Partial<ParamsOrKey>>;
 /**
   Resolves the pathname of the given `to` value against the current location. Similar to {@link useHref}, but returns a {@link Path} instead of a string.
 
@@ -730,23 +731,17 @@ type DevServerHooks = {
 };
 declare function setDevServerHooks(devServerHooks: DevServerHooks): void;
 
-/**
- * Apps can use this interface to "register" app-wide types for React Router via interface declaration merging and module augmentation.
- * React Router should handle this for you via type generation.
- *
- * For more on declaration merging and module augmentation, see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation .
- */
-interface Register {
-}
-
-type AnyParams = Record<string, Record<string, string | undefined>>;
-type Params = Register extends {
-    params: infer RegisteredParams extends AnyParams;
-} ? RegisteredParams : AnyParams;
+type AnyParams = Record<string, string | undefined>;
+type AnyPages = Record<string, {
+    params: AnyParams;
+}>;
+type Pages = Register extends {
+    pages: infer RegisteredPages extends AnyPages;
+} ? RegisteredPages : AnyPages;
 type Args = {
-    [K in keyof Params]: ToArgs<Params[K]>;
+    [K in keyof Pages]: ToArgs<Pages[K]["params"]>;
 };
-type ToArgs<T> = Equal<T, {}> extends true ? [] : Partial<T> extends T ? [T] | [] : [
+type ToArgs<T extends AnyParams> = Equal<T, {}> extends true ? [] : Partial<T> extends T ? [T] | [] : [
     T
 ];
 /**
@@ -797,4 +792,4 @@ declare function getHydrationData(state: {
     hasHydrateFallback: boolean;
 }, location: Path, basename: string | undefined, isSpaMode: boolean): HydrationState;
 
-export { ActionFunction, AppLoadContext, Blocker, BlockerFunction, ClientLoaderFunction, type Cookie, type CookieOptions, type CookieSignatureOptions, type CreateRequestHandlerFunction, DataRouteObject, Router as DataRouter, DataStrategyFunction, EntryContext, type FlashSessionData, HydrationState, IndexRouteObject, InitialEntry, type IsCookieFunction, type IsSessionFunction, LinksFunction, LoaderFunction, Location, MetaFunction, type NavigateFunction, NavigateOptions, Navigation, Action as NavigationType, NonIndexRouteObject, ParamParseKey, Params$1 as Params, PatchRoutesOnNavigationFunction, Path, PathMatch, PathPattern, type Register, RelativeRoutingType, type RequestHandler, RevalidationState, RouteObject, RouterState, type RoutesTestStubProps, ServerBuild, ServerRouter, type ServerRouterProps, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, StaticHandler, StaticHandlerContext, StaticRouter, type StaticRouterProps, StaticRouterProvider, type StaticRouterProviderProps, To, UIMatch, AssetsManifest as UNSAFE_AssetsManifest, MiddlewareEnabled as UNSAFE_MiddlewareEnabled, RemixErrorBoundary as UNSAFE_RemixErrorBoundary, RouteModules as UNSAFE_RouteModules, ServerMode as UNSAFE_ServerMode, SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol, decodeViaTurboStream as UNSAFE_decodeViaTurboStream, deserializeErrors as UNSAFE_deserializeErrors, getHydrationData as UNSAFE_getHydrationData, getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction, getTurboStreamSingleFetchDataStrategy as UNSAFE_getTurboStreamSingleFetchDataStrategy, useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, createCookie, createCookieSessionStorage, createMemorySessionStorage, createRequestHandler, createRoutesStub, createSession, createSessionStorage, createStaticHandler, createStaticRouter, href, isCookie, isSession, unstable_InitialContext, setDevServerHooks as unstable_setDevServerHooks, useActionData, useAsyncError, useAsyncValue, useBlocker, useHref, useInRouterContext, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes };
+export { ActionFunction, AppLoadContext, Blocker, BlockerFunction, ClientLoaderFunction, type Cookie, type CookieOptions, type CookieSignatureOptions, type CreateRequestHandlerFunction, DataRouteObject, Router as DataRouter, DataStrategyFunction, EntryContext, type FlashSessionData, HydrationState, IndexRouteObject, InitialEntry, type IsCookieFunction, type IsSessionFunction, LinksFunction, LoaderFunction, Location, MetaFunction, type NavigateFunction, NavigateOptions, Navigation, Action as NavigationType, NonIndexRouteObject, ParamParseKey, Params, PatchRoutesOnNavigationFunction, Path, PathMatch, PathPattern, Register, RelativeRoutingType, type RequestHandler, RevalidationState, RouteObject, RouterState, type RoutesTestStubProps, ServerBuild, ServerRouter, type ServerRouterProps, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, StaticHandler, StaticHandlerContext, StaticRouter, type StaticRouterProps, StaticRouterProvider, type StaticRouterProviderProps, To, UIMatch, AssetsManifest as UNSAFE_AssetsManifest, MiddlewareEnabled as UNSAFE_MiddlewareEnabled, RemixErrorBoundary as UNSAFE_RemixErrorBoundary, RouteModules as UNSAFE_RouteModules, ServerMode as UNSAFE_ServerMode, SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol, decodeViaTurboStream as UNSAFE_decodeViaTurboStream, deserializeErrors as UNSAFE_deserializeErrors, getHydrationData as UNSAFE_getHydrationData, getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction, getTurboStreamSingleFetchDataStrategy as UNSAFE_getTurboStreamSingleFetchDataStrategy, useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, createCookie, createCookieSessionStorage, createMemorySessionStorage, createRequestHandler, createRoutesStub, createSession, createSessionStorage, createStaticHandler, createStaticRouter, href, isCookie, isSession, unstable_InitialContext, setDevServerHooks as unstable_setDevServerHooks, useActionData, useAsyncError, useAsyncValue, useBlocker, useHref, useInRouterContext, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes };

package/dist/development/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RouteObject, a as RouterInit, F as FutureConfig$1, H as HydrationState, I as InitialEntry, D as DataStrategyFunction, P as PatchRoutesOnNavigationFunction, b as Router$1, T as To, c as RelativeRoutingType, N as NonIndexRouteObject, L as LazyRouteFunction, d as IndexRouteObject, e as Location, A as Action, f as Navigator, g as RouteMatch, h as RouteManifest, S as ServerRouteModule, M as MiddlewareEnabled, u as unstable_RouterContextProvider, i as AppLoadContext, j as LoaderFunctionArgs, k as ActionFunctionArgs, l as StaticHandlerContext, m as RouteModules, n as DataRouteObject, C as ClientLoaderFunction, o as ParamParseKey, p as Path, q as PathPattern, r as PathMatch, s as NavigateOptions, t as Params$1, v as Navigation, w as RevalidationState, U as UIMatch, x as SerializeFrom, B as BlockerFunction, y as Blocker, z as HTMLFormMethod, E as FormEncType, G as PageLinkDescriptor, J as History, K as GetScrollRestorationKeyFunction, O as Fetcher, Q as StaticHandler, V as CreateStaticHandlerOptions$1, W as unstable_InitialContext, X as LoaderFunction, Y as ActionFunction, Z as MetaFunction, _ as LinksFunction, $ as Equal, a0 as RouterState } from './route-data-fNWkI-4T.js';
-export { az as ClientActionFunction, aA as ClientActionFunctionArgs, aB as ClientLoaderFunctionArgs, ax as DataRouteMatch, a6 as DataStrategyFunctionArgs, a7 as DataStrategyMatch, a8 as DataStrategyResult, aa as ErrorResponse, ab as FormMethod, aI as Future, a1 as GetScrollPositionFunction, aC as HeadersArgs, aD as HeadersFunction, aG as HtmlLinkDescriptor, an as IDLE_BLOCKER, am as IDLE_FETCHER, al as IDLE_NAVIGATION, aH as LinkDescriptor, aE as MetaArgs, aF as MetaDescriptor, a2 as NavigationStates, ay as PatchRoutesOnNavigationFunctionArgs, ad as PathParam, ae as RedirectFunction, a5 as RouterFetchOptions, a4 as RouterNavigateOptions, a3 as RouterSubscriber, ag as ShouldRevalidateFunction, ah as ShouldRevalidateFunctionArgs, aO as UNSAFE_DataRouterContext, aP as UNSAFE_DataRouterStateContext, a9 as UNSAFE_DataWithResponseInit, aN as UNSAFE_ErrorResponseImpl, aQ as UNSAFE_FetchersContext, aR as UNSAFE_LocationContext, aS as UNSAFE_NavigationContext, aT as UNSAFE_RouteContext, aU as UNSAFE_ViewTransitionContext, aK as UNSAFE_createBrowserHistory, aM as UNSAFE_createRouter, aL as UNSAFE_invariant, aj as createPath, ao as data, ap as generatePath, aq as isRouteErrorResponse, ar as matchPath, as as matchRoutes, ak as parsePath, at as redirect, au as redirectDocument, av as replace, aw as resolvePath, ac as unstable_MiddlewareFunction, af as unstable_RouterContext, aJ as unstable_SerializesTo, ai as unstable_createContext } from './route-data-fNWkI-4T.js';
+import { R as RouteObject, a as RouterInit, F as FutureConfig$1, H as HydrationState, I as InitialEntry, D as DataStrategyFunction, P as PatchRoutesOnNavigationFunction, b as Router$1, T as To, c as RelativeRoutingType, N as NonIndexRouteObject, L as LazyRouteFunction, d as IndexRouteObject, e as Location, A as Action, f as Navigator, g as RouteMatch, h as RouteManifest, S as ServerRouteModule, M as MiddlewareEnabled, u as unstable_RouterContextProvider, i as AppLoadContext, j as LoaderFunctionArgs, k as ActionFunctionArgs, l as StaticHandlerContext, m as RouteModules, n as DataRouteObject, C as ClientLoaderFunction, o as ParamParseKey, p as Path, q as PathPattern, r as PathMatch, s as NavigateOptions, t as Params, v as Navigation, w as RevalidationState, U as UIMatch, x as SerializeFrom, B as BlockerFunction, y as Blocker, z as HTMLFormMethod, E as FormEncType, G as PageLinkDescriptor, J as History, K as GetScrollRestorationKeyFunction, O as Fetcher, Q as StaticHandler, V as CreateStaticHandlerOptions$1, W as unstable_InitialContext, X as LoaderFunction, Y as ActionFunction, Z as MetaFunction, _ as LinksFunction, $ as Equal, a0 as Register, a1 as RouterState } from './register-DEZBC9Yl.js';
+export { aA as ClientActionFunction, aB as ClientActionFunctionArgs, aC as ClientLoaderFunctionArgs, ay as DataRouteMatch, a7 as DataStrategyFunctionArgs, a8 as DataStrategyMatch, a9 as DataStrategyResult, ab as ErrorResponse, ac as FormMethod, aJ as Future, a2 as GetScrollPositionFunction, aD as HeadersArgs, aE as HeadersFunction, aH as HtmlLinkDescriptor, ao as IDLE_BLOCKER, an as IDLE_FETCHER, am as IDLE_NAVIGATION, aI as LinkDescriptor, aF as MetaArgs, aG as MetaDescriptor, a3 as NavigationStates, az as PatchRoutesOnNavigationFunctionArgs, ae as PathParam, af as RedirectFunction, a6 as RouterFetchOptions, a5 as RouterNavigateOptions, a4 as RouterSubscriber, ah as ShouldRevalidateFunction, ai as ShouldRevalidateFunctionArgs, aP as UNSAFE_DataRouterContext, aQ as UNSAFE_DataRouterStateContext, aa as UNSAFE_DataWithResponseInit, aO as UNSAFE_ErrorResponseImpl, aR as UNSAFE_FetchersContext, aS as UNSAFE_LocationContext, aT as UNSAFE_NavigationContext, aU as UNSAFE_RouteContext, aV as UNSAFE_ViewTransitionContext, aL as UNSAFE_createBrowserHistory, aN as UNSAFE_createRouter, aM as UNSAFE_invariant, ak as createPath, ap as data, aq as generatePath, ar as isRouteErrorResponse, as as matchPath, at as matchRoutes, al as parsePath, au as redirect, av as redirectDocument, aw as replace, ax as resolvePath, ad as unstable_MiddlewareFunction, ag as unstable_RouterContext, aK as unstable_SerializesTo, aj as unstable_createContext } from './register-DEZBC9Yl.js';
 import * as React from 'react';
 import { ReactElement } from 'react';
 import { ParseOptions, SerializeOptions } from 'cookie';
@@ -689,7 +689,7 @@ declare function useOutlet(context?: unknown): React.ReactElement | null;
  */
 declare function useParams<ParamsOrKey extends string | Record<string, string | undefined> = string>(): Readonly<[
     ParamsOrKey
-] extends [string] ? Params$1<ParamsOrKey> : Partial<ParamsOrKey>>;
+] extends [string] ? Params<ParamsOrKey> : Partial<ParamsOrKey>>;
 /**
   Resolves the pathname of the given `to` value against the current location. Similar to {@link useHref}, but returns a {@link Path} instead of a string.
 
@@ -2460,23 +2460,17 @@ type DevServerHooks = {
 };
 declare function setDevServerHooks(devServerHooks: DevServerHooks): void;
 
-/**
- * Apps can use this interface to "register" app-wide types for React Router via interface declaration merging and module augmentation.
- * React Router should handle this for you via type generation.
- *
- * For more on declaration merging and module augmentation, see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation .
- */
-interface Register {
-}
-
-type AnyParams = Record<string, Record<string, string | undefined>>;
-type Params = Register extends {
-    params: infer RegisteredParams extends AnyParams;
-} ? RegisteredParams : AnyParams;
+type AnyParams = Record<string, string | undefined>;
+type AnyPages = Record<string, {
+    params: AnyParams;
+}>;
+type Pages = Register extends {
+    pages: infer RegisteredPages extends AnyPages;
+} ? RegisteredPages : AnyPages;
 type Args = {
-    [K in keyof Params]: ToArgs<Params[K]>;
+    [K in keyof Pages]: ToArgs<Pages[K]["params"]>;
 };
-type ToArgs<T> = Equal<T, {}> extends true ? [] : Partial<T> extends T ? [T] | [] : [
+type ToArgs<T extends AnyParams> = Equal<T, {}> extends true ? [] : Partial<T> extends T ? [T] | [] : [
     T
 ];
 /**
@@ -2527,4 +2521,4 @@ declare function getHydrationData(state: {
     hasHydrateFallback: boolean;
 }, location: Path, basename: string | undefined, isSpaMode: boolean): HydrationState;
 
-export { ActionFunction, ActionFunctionArgs, AppLoadContext, Await, type AwaitProps, Blocker, BlockerFunction, BrowserRouter, type BrowserRouterProps, ClientLoaderFunction, type Cookie, type CookieOptions, type CookieSignatureOptions, type CreateRequestHandlerFunction, type DOMRouterOpts, DataRouteObject, Router$1 as DataRouter, DataStrategyFunction, type EntryContext, Fetcher, type FetcherFormProps, type FetcherSubmitFunction, type FetcherSubmitOptions, type FetcherWithComponents, type FlashSessionData, Form, FormEncType, type FormProps, GetScrollRestorationKeyFunction, HTMLFormMethod, type HandleDataRequestFunction, type HandleDocumentRequestFunction, type HandleErrorFunction, HashRouter, type HashRouterProps, type HistoryRouterProps, HydrationState, IndexRouteObject, type IndexRouteProps, InitialEntry, type IsCookieFunction, type IsSessionFunction, type LayoutRouteProps, LazyRouteFunction, Link, type LinkProps, Links, LinksFunction, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouter, type MemoryRouterOpts, type MemoryRouterProps, Meta, MetaFunction, NavLink, type NavLinkProps, type NavLinkRenderProps, Navigate, type NavigateFunction, NavigateOptions, type NavigateProps, Navigation, Action as NavigationType, Navigator, NonIndexRouteObject, Outlet, type OutletProps, PageLinkDescriptor, type ParamKeyValuePair, ParamParseKey, Params$1 as Params, PatchRoutesOnNavigationFunction, Path, PathMatch, PathPattern, type PathRouteProps, PrefetchPageLinks, type Register, RelativeRoutingType, type RequestHandler, RevalidationState, Route$1 as Route, RouteMatch, RouteObject, type RouteProps, Router, RouterInit, type RouterProps, RouterProvider, type RouterProviderProps, RouterState, Routes, type RoutesProps, type RoutesTestStubProps, Scripts, type ScriptsProps, ScrollRestoration, type ScrollRestorationProps, type ServerBuild, type ServerEntryModule, ServerRouter, type ServerRouterProps, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, type SetURLSearchParams, StaticHandler, StaticHandlerContext, StaticRouter, type StaticRouterProps, StaticRouterProvider, type StaticRouterProviderProps, type SubmitFunction, type SubmitOptions, type SubmitTarget, To, UIMatch, type AssetsManifest as UNSAFE_AssetsManifest, FrameworkContext as UNSAFE_FrameworkContext, MiddlewareEnabled as UNSAFE_MiddlewareEnabled, RemixErrorBoundary as UNSAFE_RemixErrorBoundary, RouteModules as UNSAFE_RouteModules, ServerMode as UNSAFE_ServerMode, SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol, createClientRoutes as UNSAFE_createClientRoutes, createClientRoutesWithHMRRevalidationOptOut as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, decodeViaTurboStream as UNSAFE_decodeViaTurboStream, deserializeErrors as UNSAFE_deserializeErrors, getHydrationData as UNSAFE_getHydrationData, getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction, getTurboStreamSingleFetchDataStrategy as UNSAFE_getTurboStreamSingleFetchDataStrategy, hydrationRouteProperties as UNSAFE_hydrationRouteProperties, mapRouteProperties as UNSAFE_mapRouteProperties, shouldHydrateRouteLoader as UNSAFE_shouldHydrateRouteLoader, useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, useScrollRestoration as UNSAFE_useScrollRestoration, type URLSearchParamsInit, createBrowserRouter, createCookie, createCookieSessionStorage, createHashRouter, createMemoryRouter, createMemorySessionStorage, createRequestHandler, createRoutesFromChildren, createRoutesFromElements, createRoutesStub, createSearchParams, createSession, createSessionStorage, createStaticHandler, createStaticRouter, href, isCookie, isSession, renderMatches, HistoryRouter as unstable_HistoryRouter, unstable_InitialContext, unstable_RouterContextProvider, setDevServerHooks as unstable_setDevServerHooks, usePrompt as unstable_usePrompt, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useBlocker, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, useSearchParams, useSubmit, useViewTransitionState };
+export { ActionFunction, ActionFunctionArgs, AppLoadContext, Await, type AwaitProps, Blocker, BlockerFunction, BrowserRouter, type BrowserRouterProps, ClientLoaderFunction, type Cookie, type CookieOptions, type CookieSignatureOptions, type CreateRequestHandlerFunction, type DOMRouterOpts, DataRouteObject, Router$1 as DataRouter, DataStrategyFunction, type EntryContext, Fetcher, type FetcherFormProps, type FetcherSubmitFunction, type FetcherSubmitOptions, type FetcherWithComponents, type FlashSessionData, Form, FormEncType, type FormProps, GetScrollRestorationKeyFunction, HTMLFormMethod, type HandleDataRequestFunction, type HandleDocumentRequestFunction, type HandleErrorFunction, HashRouter, type HashRouterProps, type HistoryRouterProps, HydrationState, IndexRouteObject, type IndexRouteProps, InitialEntry, type IsCookieFunction, type IsSessionFunction, type LayoutRouteProps, LazyRouteFunction, Link, type LinkProps, Links, LinksFunction, LoaderFunction, LoaderFunctionArgs, Location, MemoryRouter, type MemoryRouterOpts, type MemoryRouterProps, Meta, MetaFunction, NavLink, type NavLinkProps, type NavLinkRenderProps, Navigate, type NavigateFunction, NavigateOptions, type NavigateProps, Navigation, Action as NavigationType, Navigator, NonIndexRouteObject, Outlet, type OutletProps, PageLinkDescriptor, type ParamKeyValuePair, ParamParseKey, Params, PatchRoutesOnNavigationFunction, Path, PathMatch, PathPattern, type PathRouteProps, PrefetchPageLinks, Register, RelativeRoutingType, type RequestHandler, RevalidationState, Route$1 as Route, RouteMatch, RouteObject, type RouteProps, Router, RouterInit, type RouterProps, RouterProvider, type RouterProviderProps, RouterState, Routes, type RoutesProps, type RoutesTestStubProps, Scripts, type ScriptsProps, ScrollRestoration, type ScrollRestorationProps, type ServerBuild, type ServerEntryModule, ServerRouter, type ServerRouterProps, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, type SetURLSearchParams, StaticHandler, StaticHandlerContext, StaticRouter, type StaticRouterProps, StaticRouterProvider, type StaticRouterProviderProps, type SubmitFunction, type SubmitOptions, type SubmitTarget, To, UIMatch, type AssetsManifest as UNSAFE_AssetsManifest, FrameworkContext as UNSAFE_FrameworkContext, MiddlewareEnabled as UNSAFE_MiddlewareEnabled, RemixErrorBoundary as UNSAFE_RemixErrorBoundary, RouteModules as UNSAFE_RouteModules, ServerMode as UNSAFE_ServerMode, SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol, createClientRoutes as UNSAFE_createClientRoutes, createClientRoutesWithHMRRevalidationOptOut as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, decodeViaTurboStream as UNSAFE_decodeViaTurboStream, deserializeErrors as UNSAFE_deserializeErrors, getHydrationData as UNSAFE_getHydrationData, getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction, getTurboStreamSingleFetchDataStrategy as UNSAFE_getTurboStreamSingleFetchDataStrategy, hydrationRouteProperties as UNSAFE_hydrationRouteProperties, mapRouteProperties as UNSAFE_mapRouteProperties, shouldHydrateRouteLoader as UNSAFE_shouldHydrateRouteLoader, useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, useScrollRestoration as UNSAFE_useScrollRestoration, type URLSearchParamsInit, createBrowserRouter, createCookie, createCookieSessionStorage, createHashRouter, createMemoryRouter, createMemorySessionStorage, createRequestHandler, createRoutesFromChildren, createRoutesFromElements, createRoutesStub, createSearchParams, createSession, createSessionStorage, createStaticHandler, createStaticRouter, href, isCookie, isSession, renderMatches, HistoryRouter as unstable_HistoryRouter, unstable_InitialContext, unstable_RouterContextProvider, setDevServerHooks as unstable_setDevServerHooks, usePrompt as unstable_usePrompt, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useBlocker, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, useSearchParams, useSubmit, useViewTransitionState };

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-aecfb0db1
+ * react-router v0.0.0-experimental-5bbc45fb6
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5652,25 +5652,11 @@ function RouterProvider({
         viewTransitionOpts == null || isViewTransitionAvailable,
         "You provided the `viewTransition` option to a router update, but you do not appear to be running in a DOM environment as `window.startViewTransition` is not available."
       );
-      const resetTransition = () => {
-        setRenderDfd(void 0);
-        setTransition(void 0);
-        setPendingState(void 0);
-        setVtContext({ isTransitioning: false });
-      };
       if (!viewTransitionOpts || !isViewTransitionAvailable) {
-        renderDfd?.resolve();
-        transition?.skipTransition();
         if (reactDomFlushSyncImpl && flushSync) {
-          reactDomFlushSyncImpl(() => {
-            setStateImpl(newState);
-            resetTransition();
-          });
+          reactDomFlushSyncImpl(() => setStateImpl(newState));
         } else {
-          React3.startTransition(() => {
-            setStateImpl(newState);
-            resetTransition();
-          });
+          React3.startTransition(() => setStateImpl(newState));
         }
         return;
       }
@@ -5691,7 +5677,12 @@ function RouterProvider({
           reactDomFlushSyncImpl(() => setStateImpl(newState));
         });
         t.finished.finally(() => {
-          reactDomFlushSyncImpl(() => resetTransition());
+          reactDomFlushSyncImpl(() => {
+            setRenderDfd(void 0);
+            setTransition(void 0);
+            setPendingState(void 0);
+            setVtContext({ isTransitioning: false });
+          });
         });
         reactDomFlushSyncImpl(() => setTransition(t));
         return;
@@ -8799,7 +8790,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-aecfb0db1";
+    window.__reactRouterVersion = "0.0.0-experimental-5bbc45fb6";
   }
 } catch (e) {
 }

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-aecfb0db1
+ * react-router v0.0.0-experimental-5bbc45fb6
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -125,7 +125,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-RXFCVJK2.mjs";
+} from "./chunk-EKICUOCX.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/lib/types/{route-module.d.mts → internal.d.mts}

@@ -1,6 +1,57 @@
-import { aE as LinkDescriptor, L as Location, aB as MetaDescriptor, aV as ServerDataFrom, aW as ClientDataFrom, aX as Func, aY as unstable_MiddlewareNextFunction, E as Equal, ac as unstable_RouterContextProvider, s as MiddlewareEnabled, t as AppLoadContext, aZ as Pretty } from '../../route-data-BmDen1H_.mjs';
+import { R as Register } from '../../register-e9PGCFx1.mjs';
+import { aV as Normalize, aW as ServerDataFrom, aX as ClientDataFrom, aY as Func, aE as LinkDescriptor, E as Equal, L as Location, aB as MetaDescriptor, aZ as unstable_MiddlewareNextFunction, ac as unstable_RouterContextProvider, s as MiddlewareEnabled, t as AppLoadContext, a_ as Pretty } from '../../route-data-BwJdBC92.mjs';
 import 'react';
 
+type AnyRoutes = Record<string, {
+    parentId?: string;
+    path?: string;
+    index?: boolean;
+    file: string;
+    params: Record<string, string | undefined>;
+}>;
+type RoutesPre = Register extends {
+    routesPre: infer RegisteredRoutes extends AnyRoutes;
+} ? RegisteredRoutes : AnyRoutes;
+type RouteId = keyof RoutesPre;
+type GetParents<Id extends RouteId> = RoutesPre[Id] extends {
+    parentId: infer P extends RouteId;
+} ? [
+    ...GetParents<P>,
+    P
+] : [
+];
+type _GetChildren<Id extends RouteId> = {
+    [K in RouteId]: RoutesPre[K] extends {
+        parentId: Id;
+    } ? RoutesPre[K] extends {
+        index: true;
+    } ? [K] : RoutesPre[K] extends {
+        path: undefined;
+    } ? [K, ...GetChildren<K>] : [
+        K
+    ] | [K, ...GetChildren<K>] : [
+    ];
+}[RouteId];
+type GetChildren<Id extends RouteId> = _GetChildren<Id> extends [] ? [] : Exclude<_GetChildren<Id>, []>;
+type GetBranch<Id extends RouteId> = [
+    ...GetParents<Id>,
+    Id,
+    ..._GetChildren<Id>
+];
+type Branches = {
+    [Id in RouteId]: GetBranch<Id>;
+};
+type PartialParams = {
+    [Id in RouteId]: RoutesPre[Id]["params"];
+};
+type BranchParams<Branch extends Array<RouteId>> = Branch extends [
+    infer Id extends RouteId,
+    ...infer Ids extends Array<RouteId>
+] ? PartialParams[Id] & BranchParams<Ids> : {};
+type Params = {
+    [Id in RouteId]: Normalize<BranchParams<Branches[Id]>>;
+};
+
 type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
 type MaybePromise<T> = T | Promise<T>;
 type RouteModule = {
@@ -11,30 +62,28 @@ type RouteModule = {
     clientLoader?: Func;
     action?: Func;
     clientAction?: Func;
-    HydrateFallback?: unknown;
-    default?: unknown;
-    ErrorBoundary?: unknown;
+    HydrateFallback?: Func;
+    default?: Func;
+    ErrorBoundary?: Func;
     [key: string]: unknown;
 };
-type LinkDescriptors = LinkDescriptor[];
-type RouteInfo = {
-    parents: RouteInfo[];
-    module: RouteModule;
-    id: unknown;
-    file: string;
-    path: string;
+type Props = {
     params: unknown;
     loaderData: unknown;
     actionData: unknown;
 };
-type MetaMatch<T extends RouteInfo> = Pretty<Pick<T, "id" | "params"> & {
+type RouteInfo = Props & {
+    parents: Props[];
+    module: RouteModule;
+};
+type MetaMatch<T extends Props> = Pretty<Pick<T, "params"> & {
     pathname: string;
     meta: MetaDescriptor[];
     data: T["loaderData"];
     handle?: unknown;
     error?: unknown;
 }>;
-type MetaMatches<T extends RouteInfo[]> = T extends [infer F extends RouteInfo, ...infer R extends RouteInfo[]] ? [MetaMatch<F>, ...MetaMatches<R>] : Array<MetaMatch<RouteInfo> | undefined>;
+type MetaMatches<T extends Props[]> = T extends [infer F extends Props, ...infer R extends Props[]] ? [MetaMatch<F>, ...MetaMatches<R>] : Array<MetaMatch<RouteInfo> | undefined>;
 type CreateMetaArgs<T extends RouteInfo> = {
     /** This is the current router `Location` object. This is useful for generating tags for routes at specific paths or query parameters. */
     location: Location;
@@ -155,12 +204,12 @@ type CreateHydrateFallbackProps<T extends RouteInfo> = {
     loaderData?: T["loaderData"];
     actionData?: T["actionData"];
 };
-type Match<T extends RouteInfo> = Pretty<Pick<T, "id" | "params"> & {
+type Match<T extends Props> = Pretty<Pick<T, "params"> & {
     pathname: string;
     data: T["loaderData"];
     handle: unknown;
 }>;
-type Matches<T extends RouteInfo[]> = T extends [infer F extends RouteInfo, ...infer R extends RouteInfo[]] ? [Match<F>, ...Matches<R>] : Array<Match<RouteInfo> | undefined>;
+type Matches<T extends Props[]> = T extends [infer F extends Props, ...infer R extends Props[]] ? [Match<F>, ...Matches<R>] : Array<Match<Props> | undefined>;
 type CreateComponentProps<T extends RouteInfo> = {
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
@@ -204,5 +253,23 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     loaderData?: T["loaderData"];
     actionData?: T["actionData"];
 };
+type RouteModuleAnnotations<Info extends RouteInfo> = {
+    LinkDescriptors: LinkDescriptor[];
+    LinksFunction: () => LinkDescriptor[];
+    MetaArgs: CreateMetaArgs<Info>;
+    MetaDescriptors: MetaDescriptors;
+    MetaFunction: (args: CreateMetaArgs<Info>) => MetaDescriptors;
+    HeadersArgs: HeadersArgs;
+    HeadersFunction: (args: HeadersArgs) => Headers | HeadersInit;
+    unstable_MiddlewareFunction: CreateServerMiddlewareFunction<Info>;
+    unstable_ClientMiddlewareFunction: CreateClientMiddlewareFunction<Info>;
+    LoaderArgs: CreateServerLoaderArgs<Info>;
+    ClientLoaderArgs: CreateClientLoaderArgs<Info>;
+    ActionArgs: CreateServerActionArgs<Info>;
+    ClientActionArgs: CreateClientActionArgs<Info>;
+    HydrateFallbackProps: CreateHydrateFallbackProps<Info>;
+    ComponentProps: CreateComponentProps<Info>;
+    ErrorBoundaryProps: CreateErrorBoundaryProps<Info>;
+};
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateClientMiddlewareFunction, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, CreateServerMiddlewareFunction, HeadersArgs, LinkDescriptors, MetaDescriptors };
+export type { CreateActionData, CreateLoaderData, Params, RouteModuleAnnotations };

package/dist/{production/lib/types/route-module.d.mts → development/lib/types/internal.d.ts}

@@ -1,6 +1,56 @@
-import { aE as LinkDescriptor, L as Location, aB as MetaDescriptor, aV as ServerDataFrom, aW as ClientDataFrom, aX as Func, aY as unstable_MiddlewareNextFunction, E as Equal, ac as unstable_RouterContextProvider, s as MiddlewareEnabled, t as AppLoadContext, aZ as Pretty } from '../../route-data-BmDen1H_.mjs';
+import { aW as Normalize, a0 as Register, aX as ServerDataFrom, aY as ClientDataFrom, aZ as Func, aI as LinkDescriptor, $ as Equal, e as Location, aG as MetaDescriptor, a_ as unstable_MiddlewareNextFunction, u as unstable_RouterContextProvider, M as MiddlewareEnabled, i as AppLoadContext, a$ as Pretty } from '../../register-DEZBC9Yl.js';
 import 'react';
 
+type AnyRoutes = Record<string, {
+    parentId?: string;
+    path?: string;
+    index?: boolean;
+    file: string;
+    params: Record<string, string | undefined>;
+}>;
+type RoutesPre = Register extends {
+    routesPre: infer RegisteredRoutes extends AnyRoutes;
+} ? RegisteredRoutes : AnyRoutes;
+type RouteId = keyof RoutesPre;
+type GetParents<Id extends RouteId> = RoutesPre[Id] extends {
+    parentId: infer P extends RouteId;
+} ? [
+    ...GetParents<P>,
+    P
+] : [
+];
+type _GetChildren<Id extends RouteId> = {
+    [K in RouteId]: RoutesPre[K] extends {
+        parentId: Id;
+    } ? RoutesPre[K] extends {
+        index: true;
+    } ? [K] : RoutesPre[K] extends {
+        path: undefined;
+    } ? [K, ...GetChildren<K>] : [
+        K
+    ] | [K, ...GetChildren<K>] : [
+    ];
+}[RouteId];
+type GetChildren<Id extends RouteId> = _GetChildren<Id> extends [] ? [] : Exclude<_GetChildren<Id>, []>;
+type GetBranch<Id extends RouteId> = [
+    ...GetParents<Id>,
+    Id,
+    ..._GetChildren<Id>
+];
+type Branches = {
+    [Id in RouteId]: GetBranch<Id>;
+};
+type PartialParams = {
+    [Id in RouteId]: RoutesPre[Id]["params"];
+};
+type BranchParams<Branch extends Array<RouteId>> = Branch extends [
+    infer Id extends RouteId,
+    ...infer Ids extends Array<RouteId>
+] ? PartialParams[Id] & BranchParams<Ids> : {};
+type Params = {
+    [Id in RouteId]: Normalize<BranchParams<Branches[Id]>>;
+};
+
 type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
 type MaybePromise<T> = T | Promise<T>;
 type RouteModule = {
@@ -11,30 +61,28 @@ type RouteModule = {
     clientLoader?: Func;
     action?: Func;
     clientAction?: Func;
-    HydrateFallback?: unknown;
-    default?: unknown;
-    ErrorBoundary?: unknown;
+    HydrateFallback?: Func;
+    default?: Func;
+    ErrorBoundary?: Func;
     [key: string]: unknown;
 };
-type LinkDescriptors = LinkDescriptor[];
-type RouteInfo = {
-    parents: RouteInfo[];
-    module: RouteModule;
-    id: unknown;
-    file: string;
-    path: string;
+type Props = {
     params: unknown;
     loaderData: unknown;
     actionData: unknown;
 };
-type MetaMatch<T extends RouteInfo> = Pretty<Pick<T, "id" | "params"> & {
+type RouteInfo = Props & {
+    parents: Props[];
+    module: RouteModule;
+};
+type MetaMatch<T extends Props> = Pretty<Pick<T, "params"> & {
     pathname: string;
     meta: MetaDescriptor[];
     data: T["loaderData"];
     handle?: unknown;
     error?: unknown;
 }>;
-type MetaMatches<T extends RouteInfo[]> = T extends [infer F extends RouteInfo, ...infer R extends RouteInfo[]] ? [MetaMatch<F>, ...MetaMatches<R>] : Array<MetaMatch<RouteInfo> | undefined>;
+type MetaMatches<T extends Props[]> = T extends [infer F extends Props, ...infer R extends Props[]] ? [MetaMatch<F>, ...MetaMatches<R>] : Array<MetaMatch<RouteInfo> | undefined>;
 type CreateMetaArgs<T extends RouteInfo> = {
     /** This is the current router `Location` object. This is useful for generating tags for routes at specific paths or query parameters. */
     location: Location;
@@ -155,12 +203,12 @@ type CreateHydrateFallbackProps<T extends RouteInfo> = {
     loaderData?: T["loaderData"];
     actionData?: T["actionData"];
 };
-type Match<T extends RouteInfo> = Pretty<Pick<T, "id" | "params"> & {
+type Match<T extends Props> = Pretty<Pick<T, "params"> & {
     pathname: string;
     data: T["loaderData"];
     handle: unknown;
 }>;
-type Matches<T extends RouteInfo[]> = T extends [infer F extends RouteInfo, ...infer R extends RouteInfo[]] ? [Match<F>, ...Matches<R>] : Array<Match<RouteInfo> | undefined>;
+type Matches<T extends Props[]> = T extends [infer F extends Props, ...infer R extends Props[]] ? [Match<F>, ...Matches<R>] : Array<Match<Props> | undefined>;
 type CreateComponentProps<T extends RouteInfo> = {
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
@@ -204,5 +252,23 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     loaderData?: T["loaderData"];
     actionData?: T["actionData"];
 };
+type RouteModuleAnnotations<Info extends RouteInfo> = {
+    LinkDescriptors: LinkDescriptor[];
+    LinksFunction: () => LinkDescriptor[];
+    MetaArgs: CreateMetaArgs<Info>;
+    MetaDescriptors: MetaDescriptors;
+    MetaFunction: (args: CreateMetaArgs<Info>) => MetaDescriptors;
+    HeadersArgs: HeadersArgs;
+    HeadersFunction: (args: HeadersArgs) => Headers | HeadersInit;
+    unstable_MiddlewareFunction: CreateServerMiddlewareFunction<Info>;
+    unstable_ClientMiddlewareFunction: CreateClientMiddlewareFunction<Info>;
+    LoaderArgs: CreateServerLoaderArgs<Info>;
+    ClientLoaderArgs: CreateClientLoaderArgs<Info>;
+    ActionArgs: CreateServerActionArgs<Info>;
+    ClientActionArgs: CreateClientActionArgs<Info>;
+    HydrateFallbackProps: CreateHydrateFallbackProps<Info>;
+    ComponentProps: CreateComponentProps<Info>;
+    ErrorBoundaryProps: CreateErrorBoundaryProps<Info>;
+};
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateClientMiddlewareFunction, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, CreateServerMiddlewareFunction, HeadersArgs, LinkDescriptors, MetaDescriptors };
+export type { CreateActionData, CreateLoaderData, Params, RouteModuleAnnotations };

package/dist/development/lib/types/{route-module.js → internal.js}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-aecfb0db1
+ * react-router v0.0.0-experimental-5bbc45fb6
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -23,6 +23,6 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// lib/types/route-module.ts
-var route_module_exports = {};
-module.exports = __toCommonJS(route_module_exports);
+// lib/types/internal.ts
+var internal_exports = {};
+module.exports = __toCommonJS(internal_exports);

package/dist/development/lib/types/{route-module.mjs → internal.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-aecfb0db1
+ * react-router v0.0.0-experimental-5bbc45fb6
  *
  * Copyright (c) Remix Software Inc.
  *