react-router 0.0.0-experimental-00e730ed0 → 0.0.0-experimental-93ddf3985

package/dist/development/{chunk-W26YWAGH.mjs → chunk-H6SUWWJW.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-00e730ed0
+ * react-router v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8679,7 +8679,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-00e730ed0";
+    window.__reactRouterVersion = "0.0.0-experimental-93ddf3985";
   }
 } 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-DRnPBLeb.mjs';
-import { R as RouterInit } from './route-data-Wlht-qYx.mjs';
+import { R as RouterProviderProps$1 } from './lib-B8x_tOvL.mjs';
+import { R as RouterInit } from './route-data-WyrduLgj.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-00e730ed0
+ * react-router v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/dom-export.mjs

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

package/dist/development/index.d.mts

@@ -1,12 +1,13 @@
-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, U as UIMatch, S as SerializeFrom, B as BlockerFunction, j as Blocker, k as StaticHandlerContext, l as StaticHandler, F as FutureConfig, C as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, u as unstable_InitialContext, m as IndexRouteObject, n as NonIndexRouteObject, o as LoaderFunction, p as ActionFunction, M as MetaFunction, q as LinksFunction, r as MiddlewareEnabled, s as AppLoadContext, E as Equal, t as RouterState, v as PatchRoutesOnNavigationFunction, w as DataRouteObject, x as ClientLoaderFunction } from './route-data-Wlht-qYx.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, z as Fetcher, a0 as FormEncType, a1 as FormMethod, aF as Future, G as GetScrollPositionFunction, y 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, J as NavigationStates, as as Navigator, aC as PageLinkDescriptor, at as PatchRoutesOnNavigationFunctionArgs, a6 as PathParam, a7 as RedirectFunction, V as RevalidationState, au as RouteMatch, Q as RouterFetchOptions, R as RouterInit, O as RouterNavigateOptions, K 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-Wlht-qYx.mjs';
-import { A as AssetsManifest, E as EntryContext, F as FutureConfig$1, S as ServerBuild } from './lib-DRnPBLeb.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-DRnPBLeb.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, U as UIMatch, S as SerializeFrom, B as BlockerFunction, j as Blocker, k as StaticHandlerContext, l as StaticHandler, F as FutureConfig, C as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, u as unstable_InitialContext, m as IndexRouteObject, n as NonIndexRouteObject, o as LoaderFunction, p as ActionFunction, M as MetaFunction, q as LinksFunction, r as MiddlewareEnabled, s as AppLoadContext, E as Equal, t as RouterState, v as PatchRoutesOnNavigationFunction, w as DataRouteObject, x as ClientLoaderFunction } from './route-data-WyrduLgj.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, z as Fetcher, a0 as FormEncType, a1 as FormMethod, aF as Future, G as GetScrollPositionFunction, y 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, J as NavigationStates, as as Navigator, aC as PageLinkDescriptor, at as PatchRoutesOnNavigationFunctionArgs, a6 as PathParam, a7 as RedirectFunction, V as RevalidationState, au as RouteMatch, Q as RouterFetchOptions, R as RouterInit, O as RouterNavigateOptions, K 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-WyrduLgj.mjs';
+import { A as AssetsManifest, E as EntryContext, F as FutureConfig$1, S as ServerBuild } from './lib-B8x_tOvL.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-B8x_tOvL.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';
+import { P as Pages } from './register-DeIo2iHO.mjs';
+export { R as Register } from './register-DeIo2iHO.mjs';
 
 declare const SingleFetchRedirectSymbol: unique symbol;
 declare function getTurboStreamSingleFetchDataStrategy(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, basename: string | undefined): DataStrategyFunction;
@@ -745,18 +746,11 @@ type DevServerHooks = {
 };
 declare function setDevServerHooks(devServerHooks: DevServerHooks): void;
 
-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 Pages]: ToArgs<Pages[K]["params"]>;
 };
-type ToArgs<T extends AnyParams> = Equal<T, {}> extends true ? [] : Partial<T> extends T ? [T] | [] : [
-    T
+type ToArgs<Params extends Record<string, string | undefined>> = Equal<Params, {}> extends true ? [] : Partial<Params> extends Params ? [Params] | [] : [
+    Params
 ];
 /**
   Returns a resolved URL path for the specified route.
@@ -806,4 +800,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, PatchRoutesOnNavigationFunction, Path, PathMatch, PathPattern, Register, RelativeRoutingType, type RequestHandler, 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, RelativeRoutingType, type RequestHandler, 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, v as Navigation, U as UIMatch, w as SerializeFrom, B as BlockerFunction, x as Blocker, y as HTMLFormMethod, z as FormEncType, E as PageLinkDescriptor, G as History, J as GetScrollRestorationKeyFunction, K as Fetcher, O as StaticHandler, Q as CreateStaticHandlerOptions$1, V as unstable_InitialContext, W as LoaderFunction, X as ActionFunction, Y as MetaFunction, Z as LinksFunction, _ as Equal, $ as Register, a0 as RouterState } from './register-BPC2Sp5k.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, a1 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, a2 as NavigationStates, az as PatchRoutesOnNavigationFunctionArgs, ae as PathParam, af as RedirectFunction, a6 as RevalidationState, a5 as RouterFetchOptions, a4 as RouterNavigateOptions, a3 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-BPC2Sp5k.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, U as UIMatch, w as SerializeFrom, B as BlockerFunction, x as Blocker, y as HTMLFormMethod, z as FormEncType, E as PageLinkDescriptor, G as History, J as GetScrollRestorationKeyFunction, K as Fetcher, O as StaticHandler, Q as CreateStaticHandlerOptions$1, V as unstable_InitialContext, W as LoaderFunction, X as ActionFunction, Y as MetaFunction, Z as LinksFunction, _ as Pages, $ as Equal, a0 as RouterState } from './register-BkDIKxVz.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, a1 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, a2 as NavigationStates, az as PatchRoutesOnNavigationFunctionArgs, ae as PathParam, af as RedirectFunction, aL as Register, a6 as RevalidationState, a5 as RouterFetchOptions, a4 as RouterNavigateOptions, a3 as RouterSubscriber, ah as ShouldRevalidateFunction, ai as ShouldRevalidateFunctionArgs, aQ as UNSAFE_DataRouterContext, aR as UNSAFE_DataRouterStateContext, aa as UNSAFE_DataWithResponseInit, aP as UNSAFE_ErrorResponseImpl, aS as UNSAFE_FetchersContext, aT as UNSAFE_LocationContext, aU as UNSAFE_NavigationContext, aV as UNSAFE_RouteContext, aW as UNSAFE_ViewTransitionContext, aM as UNSAFE_createBrowserHistory, aO as UNSAFE_createRouter, aN 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-BkDIKxVz.js';
 import * as React from 'react';
 import { ReactElement } from 'react';
 import { ParseOptions, SerializeOptions } from 'cookie';
@@ -2474,18 +2474,11 @@ type DevServerHooks = {
 };
 declare function setDevServerHooks(devServerHooks: DevServerHooks): void;
 
-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 Pages]: ToArgs<Pages[K]["params"]>;
 };
-type ToArgs<T extends AnyParams> = Equal<T, {}> extends true ? [] : Partial<T> extends T ? [T] | [] : [
-    T
+type ToArgs<Params extends Record<string, string | undefined>> = Equal<Params, {}> extends true ? [] : Partial<Params> extends Params ? [Params] | [] : [
+    Params
 ];
 /**
   Returns a resolved URL path for the specified route.
@@ -2535,4 +2528,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, PatchRoutesOnNavigationFunction, Path, PathMatch, PathPattern, type PathRouteProps, PrefetchPageLinks, Register, RelativeRoutingType, type RequestHandler, 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, RelativeRoutingType, type RequestHandler, 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-00e730ed0
+ * react-router v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8829,7 +8829,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-00e730ed0";
+    window.__reactRouterVersion = "0.0.0-experimental-93ddf3985";
   }
 } catch (e) {
 }

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-00e730ed0
+ * react-router v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -125,7 +125,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-W26YWAGH.mjs";
+} from "./chunk-H6SUWWJW.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/lib/types/internal.d.mts

@@ -1,102 +1,42 @@
-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, r as MiddlewareEnabled, s as AppLoadContext, a_ as Pretty } from '../../route-data-Wlht-qYx.mjs';
+import { aE as LinkDescriptor, aV as RouteModule, L as Location, aB as MetaDescriptor, aW as unstable_MiddlewareNextFunction, aX as ServerDataFrom, ac as unstable_RouterContextProvider, r as MiddlewareEnabled, s as AppLoadContext, aY as Pretty, aZ as GetLoaderData, a_ as Normalize, a$ as GetActionData } from '../../route-data-WyrduLgj.mjs';
+import { a as RouteFiles, P as Pages } from '../../register-DeIo2iHO.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,
-    ...(RoutesPre[Id] extends {
-        path: undefined;
-    } ? GetChildren<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 = {
-    meta?: Func;
-    links?: Func;
-    headers?: Func;
-    loader?: Func;
-    clientLoader?: Func;
-    action?: Func;
-    clientAction?: Func;
-    HydrateFallback?: Func;
-    default?: Func;
-    ErrorBoundary?: Func;
-    [key: string]: unknown;
-};
 type Props = {
     params: unknown;
     loaderData: unknown;
     actionData: unknown;
 };
 type RouteInfo = Props & {
-    parents: Props[];
+    module: RouteModule;
+    matches: Array<MatchInfo>;
+};
+type MatchInfo = {
+    id: string;
     module: RouteModule;
 };
-type MetaMatch<T extends Props> = Pretty<Pick<T, "params"> & {
+type MetaMatch<T extends MatchInfo> = Pretty<{
+    id: T["id"];
+    params: Record<string, string | undefined>;
     pathname: string;
     meta: MetaDescriptor[];
-    data: T["loaderData"];
+    data: GetLoaderData<T["module"]>;
     handle?: unknown;
     error?: unknown;
 }>;
-type MetaMatches<T extends Props[]> = T extends [infer F extends Props, ...infer R extends Props[]] ? [MetaMatch<F>, ...MetaMatches<R>] : Array<MetaMatch<RouteInfo> | undefined>;
+type MetaMatches<T extends Array<MatchInfo>> = T extends [infer F extends MatchInfo, ...infer R extends Array<MatchInfo>] ? [MetaMatch<F>, ...MetaMatches<R>] : Array<MetaMatch<MatchInfo> | 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;
     /** {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route. */
     params: T["params"];
     /** The return value for this route's server loader function */
-    data: T["loaderData"];
+    data: T["loaderData"] | undefined;
     /** Thrown errors that trigger error boundaries will be passed to the meta function. This is useful for generating metadata for error pages. */
     error?: unknown;
     /** An array of the current {@link https://api.reactrouter.com/v7/interfaces/react_router.UIMatch.html route matches}, including parent route matches. */
-    matches: MetaMatches<[...T["parents"], T]>;
+    matches: MetaMatches<T["matches"]>;
 };
 type MetaDescriptors = MetaDescriptor[];
 type HeadersArgs = {
@@ -105,26 +45,6 @@ type HeadersArgs = {
     actionHeaders: Headers;
     errorHeaders: Headers | undefined;
 };
-type IsHydrate<ClientLoader> = ClientLoader extends {
-    hydrate: true;
-} ? true : ClientLoader extends {
-    hydrate: false;
-} ? false : false;
-type CreateLoaderData<T extends RouteModule> = _CreateLoaderData<ServerDataFrom<T["loader"]>, ClientDataFrom<T["clientLoader"]>, IsHydrate<T["clientLoader"]>, T extends {
-    HydrateFallback: Func;
-} ? true : false>;
-type _CreateLoaderData<ServerLoaderData, ClientLoaderData, ClientLoaderHydrate extends boolean, HasHydrateFallback> = [
-    HasHydrateFallback,
-    ClientLoaderHydrate
-] extends [true, true] ? IsDefined<ClientLoaderData> extends true ? ClientLoaderData : undefined : [
-    IsDefined<ClientLoaderData>,
-    IsDefined<ServerLoaderData>
-] extends [true, true] ? ServerLoaderData | ClientLoaderData : IsDefined<ClientLoaderData> extends true ? ClientLoaderData : IsDefined<ServerLoaderData> extends true ? ServerLoaderData : undefined;
-type CreateActionData<T extends RouteModule> = _CreateActionData<ServerDataFrom<T["action"]>, ClientDataFrom<T["clientAction"]>>;
-type _CreateActionData<ServerActionData, ClientActionData> = Awaited<[
-    IsDefined<ServerActionData>,
-    IsDefined<ClientActionData>
-] extends [true, true] ? ServerActionData | ClientActionData : IsDefined<ClientActionData> extends true ? ClientActionData : IsDefined<ServerActionData> extends true ? ServerActionData : undefined>;
 type ClientDataFunctionArgs<T extends RouteInfo> = {
     /**
      * A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read the URL, the method, the "content-type" header, and the request body from the request.
@@ -148,9 +68,12 @@ type ClientDataFunctionArgs<T extends RouteInfo> = {
      **/
     params: T["params"];
     /**
-     * This is a `RouterContextProvider` instance generated from your router's
-     * `unstable_getContext` function and/or populated from route middleware
-     * functions.
+     * When `future.unstable_middleware` is not enabled, this is undefined.
+     *
+     * When `future.unstable_middleware` is enabled, this is an instance of
+     * `unstable_RouterContextProvider` and can be used to access context values
+     * from your route middlewares.  You may pass in initial context values in your
+     * `<HydratedRouter unstable_getContext>` prop
      */
     context: unstable_RouterContextProvider;
 };
@@ -203,12 +126,14 @@ type CreateHydrateFallbackProps<T extends RouteInfo> = {
     loaderData?: T["loaderData"];
     actionData?: T["actionData"];
 };
-type Match<T extends Props> = Pretty<Pick<T, "params"> & {
+type Match<T extends MatchInfo> = Pretty<{
+    id: T["id"];
+    params: Record<string, string | undefined>;
     pathname: string;
-    data: T["loaderData"];
+    data: GetLoaderData<T["module"]>;
     handle: unknown;
 }>;
-type Matches<T extends Props[]> = T extends [infer F extends Props, ...infer R extends Props[]] ? [Match<F>, ...Matches<R>] : Array<Match<Props> | undefined>;
+type Matches<T extends Array<MatchInfo>> = T extends [infer F extends MatchInfo, ...infer R extends Array<MatchInfo>] ? [Match<F>, ...Matches<R>] : Array<Match<MatchInfo> | undefined>;
 type CreateComponentProps<T extends RouteInfo> = {
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
@@ -230,7 +155,7 @@ type CreateComponentProps<T extends RouteInfo> = {
     /** The data returned from the `action` or `clientAction` following an action submission. */
     actionData?: T["actionData"];
     /** An array of the current {@link https://api.reactrouter.com/v7/interfaces/react_router.UIMatch.html route matches}, including parent route matches. */
-    matches: Matches<[...T["parents"], T]>;
+    matches: Matches<T["matches"]>;
 };
 type CreateErrorBoundaryProps<T extends RouteInfo> = {
     /**
@@ -252,7 +177,7 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     loaderData?: T["loaderData"];
     actionData?: T["actionData"];
 };
-type RouteModuleAnnotations<Info extends RouteInfo> = {
+type GetAnnotations<Info extends RouteInfo> = {
     LinkDescriptors: LinkDescriptor[];
     LinksFunction: () => LinkDescriptor[];
     MetaArgs: CreateMetaArgs<Info>;
@@ -271,4 +196,15 @@ type RouteModuleAnnotations<Info extends RouteInfo> = {
     ErrorBoundaryProps: CreateErrorBoundaryProps<Info>;
 };
 
-export type { CreateActionData, CreateLoaderData, Params, RouteModuleAnnotations };
+type Params<RouteFile extends keyof RouteFiles> = Normalize<Pages[RouteFiles[RouteFile]["page"]]["params"]>;
+
+type GetInfo<T extends {
+    file: keyof RouteFiles;
+    module: RouteModule;
+}> = {
+    params: Params<T["file"]>;
+    loaderData: GetLoaderData<T["module"]>;
+    actionData: GetActionData<T["module"]>;
+};
+
+export type { GetAnnotations, GetInfo };

package/dist/development/lib/types/internal.d.ts

@@ -1,101 +1,41 @@
-import { aW as Normalize, $ 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-BPC2Sp5k.js';
+import { aI as LinkDescriptor, aX as RouteModule, e as Location, aG as MetaDescriptor, aY as unstable_MiddlewareNextFunction, aZ as ServerDataFrom, u as unstable_RouterContextProvider, M as MiddlewareEnabled, i as AppLoadContext, a_ as Pretty, a$ as GetLoaderData, b0 as RouteFiles, b1 as Normalize, _ as Pages, b2 as GetActionData } from '../../register-BkDIKxVz.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,
-    ...(RoutesPre[Id] extends {
-        path: undefined;
-    } ? GetChildren<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 = {
-    meta?: Func;
-    links?: Func;
-    headers?: Func;
-    loader?: Func;
-    clientLoader?: Func;
-    action?: Func;
-    clientAction?: Func;
-    HydrateFallback?: Func;
-    default?: Func;
-    ErrorBoundary?: Func;
-    [key: string]: unknown;
-};
 type Props = {
     params: unknown;
     loaderData: unknown;
     actionData: unknown;
 };
 type RouteInfo = Props & {
-    parents: Props[];
+    module: RouteModule;
+    matches: Array<MatchInfo>;
+};
+type MatchInfo = {
+    id: string;
     module: RouteModule;
 };
-type MetaMatch<T extends Props> = Pretty<Pick<T, "params"> & {
+type MetaMatch<T extends MatchInfo> = Pretty<{
+    id: T["id"];
+    params: Record<string, string | undefined>;
     pathname: string;
     meta: MetaDescriptor[];
-    data: T["loaderData"];
+    data: GetLoaderData<T["module"]>;
     handle?: unknown;
     error?: unknown;
 }>;
-type MetaMatches<T extends Props[]> = T extends [infer F extends Props, ...infer R extends Props[]] ? [MetaMatch<F>, ...MetaMatches<R>] : Array<MetaMatch<RouteInfo> | undefined>;
+type MetaMatches<T extends Array<MatchInfo>> = T extends [infer F extends MatchInfo, ...infer R extends Array<MatchInfo>] ? [MetaMatch<F>, ...MetaMatches<R>] : Array<MetaMatch<MatchInfo> | 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;
     /** {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route. */
     params: T["params"];
     /** The return value for this route's server loader function */
-    data: T["loaderData"];
+    data: T["loaderData"] | undefined;
     /** Thrown errors that trigger error boundaries will be passed to the meta function. This is useful for generating metadata for error pages. */
     error?: unknown;
     /** An array of the current {@link https://api.reactrouter.com/v7/interfaces/react_router.UIMatch.html route matches}, including parent route matches. */
-    matches: MetaMatches<[...T["parents"], T]>;
+    matches: MetaMatches<T["matches"]>;
 };
 type MetaDescriptors = MetaDescriptor[];
 type HeadersArgs = {
@@ -104,26 +44,6 @@ type HeadersArgs = {
     actionHeaders: Headers;
     errorHeaders: Headers | undefined;
 };
-type IsHydrate<ClientLoader> = ClientLoader extends {
-    hydrate: true;
-} ? true : ClientLoader extends {
-    hydrate: false;
-} ? false : false;
-type CreateLoaderData<T extends RouteModule> = _CreateLoaderData<ServerDataFrom<T["loader"]>, ClientDataFrom<T["clientLoader"]>, IsHydrate<T["clientLoader"]>, T extends {
-    HydrateFallback: Func;
-} ? true : false>;
-type _CreateLoaderData<ServerLoaderData, ClientLoaderData, ClientLoaderHydrate extends boolean, HasHydrateFallback> = [
-    HasHydrateFallback,
-    ClientLoaderHydrate
-] extends [true, true] ? IsDefined<ClientLoaderData> extends true ? ClientLoaderData : undefined : [
-    IsDefined<ClientLoaderData>,
-    IsDefined<ServerLoaderData>
-] extends [true, true] ? ServerLoaderData | ClientLoaderData : IsDefined<ClientLoaderData> extends true ? ClientLoaderData : IsDefined<ServerLoaderData> extends true ? ServerLoaderData : undefined;
-type CreateActionData<T extends RouteModule> = _CreateActionData<ServerDataFrom<T["action"]>, ClientDataFrom<T["clientAction"]>>;
-type _CreateActionData<ServerActionData, ClientActionData> = Awaited<[
-    IsDefined<ServerActionData>,
-    IsDefined<ClientActionData>
-] extends [true, true] ? ServerActionData | ClientActionData : IsDefined<ClientActionData> extends true ? ClientActionData : IsDefined<ServerActionData> extends true ? ServerActionData : undefined>;
 type ClientDataFunctionArgs<T extends RouteInfo> = {
     /**
      * A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read the URL, the method, the "content-type" header, and the request body from the request.
@@ -147,9 +67,12 @@ type ClientDataFunctionArgs<T extends RouteInfo> = {
      **/
     params: T["params"];
     /**
-     * This is a `RouterContextProvider` instance generated from your router's
-     * `unstable_getContext` function and/or populated from route middleware
-     * functions.
+     * When `future.unstable_middleware` is not enabled, this is undefined.
+     *
+     * When `future.unstable_middleware` is enabled, this is an instance of
+     * `unstable_RouterContextProvider` and can be used to access context values
+     * from your route middlewares.  You may pass in initial context values in your
+     * `<HydratedRouter unstable_getContext>` prop
      */
     context: unstable_RouterContextProvider;
 };
@@ -202,12 +125,14 @@ type CreateHydrateFallbackProps<T extends RouteInfo> = {
     loaderData?: T["loaderData"];
     actionData?: T["actionData"];
 };
-type Match<T extends Props> = Pretty<Pick<T, "params"> & {
+type Match<T extends MatchInfo> = Pretty<{
+    id: T["id"];
+    params: Record<string, string | undefined>;
     pathname: string;
-    data: T["loaderData"];
+    data: GetLoaderData<T["module"]>;
     handle: unknown;
 }>;
-type Matches<T extends Props[]> = T extends [infer F extends Props, ...infer R extends Props[]] ? [Match<F>, ...Matches<R>] : Array<Match<Props> | undefined>;
+type Matches<T extends Array<MatchInfo>> = T extends [infer F extends MatchInfo, ...infer R extends Array<MatchInfo>] ? [Match<F>, ...Matches<R>] : Array<Match<MatchInfo> | undefined>;
 type CreateComponentProps<T extends RouteInfo> = {
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
@@ -229,7 +154,7 @@ type CreateComponentProps<T extends RouteInfo> = {
     /** The data returned from the `action` or `clientAction` following an action submission. */
     actionData?: T["actionData"];
     /** An array of the current {@link https://api.reactrouter.com/v7/interfaces/react_router.UIMatch.html route matches}, including parent route matches. */
-    matches: Matches<[...T["parents"], T]>;
+    matches: Matches<T["matches"]>;
 };
 type CreateErrorBoundaryProps<T extends RouteInfo> = {
     /**
@@ -251,7 +176,7 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     loaderData?: T["loaderData"];
     actionData?: T["actionData"];
 };
-type RouteModuleAnnotations<Info extends RouteInfo> = {
+type GetAnnotations<Info extends RouteInfo> = {
     LinkDescriptors: LinkDescriptor[];
     LinksFunction: () => LinkDescriptor[];
     MetaArgs: CreateMetaArgs<Info>;
@@ -270,4 +195,15 @@ type RouteModuleAnnotations<Info extends RouteInfo> = {
     ErrorBoundaryProps: CreateErrorBoundaryProps<Info>;
 };
 
-export type { CreateActionData, CreateLoaderData, Params, RouteModuleAnnotations };
+type Params<RouteFile extends keyof RouteFiles> = Normalize<Pages[RouteFiles[RouteFile]["page"]]["params"]>;
+
+type GetInfo<T extends {
+    file: keyof RouteFiles;
+    module: RouteModule;
+}> = {
+    params: Params<T["file"]>;
+    loaderData: GetLoaderData<T["module"]>;
+    actionData: GetActionData<T["module"]>;
+};
+
+export type { GetAnnotations, GetInfo };

package/dist/development/lib/types/internal.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-00e730ed0
+ * react-router v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *