react-router 7.14.1 → 7.15.0

package/dist/{production/context-BzhbVly6.d.mts → development/context-BQs41HrG.d.mts}

@@ -1,25 +1,25 @@
-import { m as HTMLFormMethod, n as FormEncType, o as LoaderFunctionArgs, p as MiddlewareEnabled, c as RouterContextProvider, q as AppLoadContext, r as RouteObject, s as History, t as MaybePromise, u as MapRoutePropertiesFunction, v as Action, L as Location, w as DataRouteMatch, x as Submission, y as RouteData, z as DataStrategyFunction, B as PatchRoutesOnNavigationFunction, E as DataRouteObject, U as UIMatch, T as To, I as Path, P as Params, J as InitialEntry, K as NonIndexRouteObject, O as LazyRouteFunction, Q as IndexRouteObject, V as RouteMatch, W as TrackedPromise } from './routeModules-Djumx26z.mjs';
+import { m as HTMLFormMethod, n as FormEncType, o as LoaderFunctionArgs, p as MiddlewareEnabled, c as RouterContextProvider, q as AppLoadContext, r as RouteObject, s as History, t as MaybePromise, u as MapRoutePropertiesFunction, v as Action, L as Location, w as DataRouteMatch, x as Submission, y as RouteData, z as DataStrategyFunction, B as PatchRoutesOnNavigationFunction, E as DataRouteObject, I as RouteBranch, J as RouteManifest, U as UIMatch, T as To, K as Path, P as Params, O as InitialEntry, Q as NonIndexRouteObject, V as LazyRouteFunction, W as IndexRouteObject, X as RouteMatch, Y as TrackedPromise } from './data-BVUf681J.mjs';
 import * as React from 'react';
 
-type unstable_ServerInstrumentation = {
-    handler?: unstable_InstrumentRequestHandlerFunction;
-    route?: unstable_InstrumentRouteFunction;
+type ServerInstrumentation = {
+    handler?: InstrumentRequestHandlerFunction;
+    route?: InstrumentRouteFunction;
 };
-type unstable_ClientInstrumentation = {
-    router?: unstable_InstrumentRouterFunction;
-    route?: unstable_InstrumentRouteFunction;
+type ClientInstrumentation = {
+    router?: InstrumentRouterFunction;
+    route?: InstrumentRouteFunction;
 };
-type unstable_InstrumentRequestHandlerFunction = (handler: InstrumentableRequestHandler) => void;
-type unstable_InstrumentRouterFunction = (router: InstrumentableRouter) => void;
-type unstable_InstrumentRouteFunction = (route: InstrumentableRoute) => void;
-type unstable_InstrumentationHandlerResult = {
+type InstrumentRequestHandlerFunction = (handler: InstrumentableRequestHandler) => void;
+type InstrumentRouterFunction = (router: InstrumentableRouter) => void;
+type InstrumentRouteFunction = (route: InstrumentableRoute) => void;
+type InstrumentationHandlerResult = {
     status: "success";
     error: undefined;
 } | {
     status: "error";
     error: Error;
 };
-type InstrumentFunction<T> = (handler: () => Promise<unstable_InstrumentationHandlerResult>, info: T) => Promise<void>;
+type InstrumentFunction<T> = (handler: () => Promise<InstrumentationHandlerResult>, info: T) => Promise<void>;
 type ReadonlyRequest = {
     method: string;
     url: string;
@@ -45,7 +45,7 @@ type RouteLazyInstrumentationInfo = undefined;
 type RouteHandlerInstrumentationInfo = Readonly<{
     request: ReadonlyRequest;
     params: LoaderFunctionArgs["params"];
-    unstable_pattern: string;
+    pattern: string;
     context: ReadonlyContext;
 }>;
 type InstrumentableRouter = {
@@ -115,6 +115,20 @@ interface Router$1 {
      * Return the routes for this router instance
      */
     get routes(): DataRouteObject[];
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * Return the route branches for this router instance
+     */
+    get branches(): RouteBranch<DataRouteObject>[] | undefined;
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * Return the manifest for this router instance
+     */
+    get manifest(): RouteManifest;
     /**
      * @private
      * PRIVATE - DO NOT USE
@@ -362,7 +376,6 @@ type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "e
  * Future flags to toggle new feature behavior
  */
 interface FutureConfig {
-    unstable_passThroughRequests: boolean;
 }
 /**
  * Initialization options for createRouter
@@ -372,7 +385,7 @@ interface RouterInit {
     history: History;
     basename?: string;
     getContext?: () => MaybePromise<RouterContextProvider>;
-    unstable_instrumentations?: unstable_ClientInstrumentation[];
+    instrumentations?: ClientInstrumentation[];
     mapRouteProperties?: MapRoutePropertiesFunction;
     future?: Partial<FutureConfig>;
     hydrationRouteProperties?: string[];
@@ -400,7 +413,33 @@ interface StaticHandlerContext {
  * A StaticHandler instance manages a singular SSR navigation/fetch event
  */
 interface StaticHandler {
+    /**
+     * The set of data routes managed by this handler
+     */
     dataRoutes: DataRouteObject[];
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * The route branches derived from the data routes, used for internal route
+     * matching in Framework Mode
+     */
+    _internalRouteBranches: RouteBranch<DataRouteObject>[];
+    /**
+     * Perform a query for a given request - executing all matched route
+     * loaders/actions.  Used for document requests.
+     *
+     * @param request The request to query
+     * @param opts Optional query options
+     * @param opts.dataStrategy Alternate dataStrategy implementation
+     * @param opts.filterMatchesToLoad Predicate function to filter which matches should be loaded
+     * @param opts.generateMiddlewareResponse To enable middleware, provide a function
+     * to generate a response to bubble back up the middleware chain
+     * @param opts.requestContext Context object to pass to loaders/actions
+     * @param opts.skipLoaderErrorBubbling Skip loader error bubbling
+     * @param opts.skipRevalidation Skip revalidation after action submission
+     * @param opts.normalizePath Normalize the request path
+     */
     query(request: Request, opts?: {
         requestContext?: unknown;
         filterMatchesToLoad?: (match: DataRouteMatch) => boolean;
@@ -410,14 +449,27 @@ interface StaticHandler {
         generateMiddlewareResponse?: (query: (r: Request, args?: {
             filterMatchesToLoad?: (match: DataRouteMatch) => boolean;
         }) => Promise<StaticHandlerContext | Response>) => MaybePromise<Response>;
-        unstable_normalizePath?: (request: Request) => Path;
+        normalizePath?: (request: Request) => Path;
     }): Promise<StaticHandlerContext | Response>;
+    /**
+     * Perform a query for a specific route.  Used for resource requests.
+     *
+     * @param request The request to query
+     * @param opts Optional queryRoute options
+     * @param opts.dataStrategy Alternate dataStrategy implementation
+     * @param opts.generateMiddlewareResponse To enable middleware, provide a function
+     * to generate a response to bubble back up the middleware chain
+     * @param opts.requestContext Context object to pass to loaders/actions
+     * @param opts.routeId The ID of the route to query
+     * @param opts.normalizePath Normalize the request path
+  
+     */
     queryRoute(request: Request, opts?: {
         routeId?: string;
         requestContext?: unknown;
         dataStrategy?: DataStrategyFunction<unknown>;
         generateMiddlewareResponse?: (queryRoute: (r: Request) => Promise<Response>) => MaybePromise<Response>;
-        unstable_normalizePath?: (request: Request) => Path;
+        normalizePath?: (request: Request) => Path;
     }): Promise<any>;
 }
 type ViewTransitionOpts = {
@@ -461,14 +513,14 @@ type BaseNavigateOrFetchOptions = {
     preventScrollReset?: boolean;
     relative?: RelativeRoutingType;
     flushSync?: boolean;
-    unstable_defaultShouldRevalidate?: boolean;
+    defaultShouldRevalidate?: boolean;
 };
 type BaseNavigateOptions = BaseNavigateOrFetchOptions & {
     replace?: boolean;
     state?: any;
     fromRouteId?: string;
     viewTransition?: boolean;
-    unstable_mask?: To;
+    mask?: To;
 };
 type BaseSubmissionOptions = {
     formMethod?: HTMLFormMethod;
@@ -651,7 +703,7 @@ declare function createRouter(init: RouterInit): Router$1;
 interface CreateStaticHandlerOptions {
     basename?: string;
     mapRouteProperties?: MapRoutePropertiesFunction;
-    unstable_instrumentations?: Pick<unstable_ServerInstrumentation, "route">[];
+    instrumentations?: Pick<ServerInstrumentation, "route">[];
     future?: Partial<FutureConfig>;
 }
 
@@ -702,7 +754,7 @@ interface MemoryRouterOpts {
      *
      * ```tsx
      * let router = createBrowserRouter(routes, {
-     *   unstable_instrumentations: [logging]
+     *   instrumentations: [logging]
      * });
      *
      *
@@ -740,7 +792,7 @@ interface MemoryRouterOpts {
      * }
      * ```
      */
-    unstable_instrumentations?: unstable_ClientInstrumentation[];
+    instrumentations?: ClientInstrumentation[];
     /**
      * Override the default data strategy of running loaders in parallel -
      * see the [docs](../../how-to/data-strategy) for more information.
@@ -792,7 +844,7 @@ interface MemoryRouterOpts {
  * @param {MemoryRouterOpts.hydrationData} opts.hydrationData n/a
  * @param {MemoryRouterOpts.initialEntries} opts.initialEntries n/a
  * @param {MemoryRouterOpts.initialIndex} opts.initialIndex n/a
- * @param {MemoryRouterOpts.unstable_instrumentations} opts.unstable_instrumentations n/a
+ * @param {MemoryRouterOpts.instrumentations} opts.instrumentations n/a
  * @param {MemoryRouterOpts.patchRoutesOnNavigation} opts.patchRoutesOnNavigation n/a
  * @returns An initialized {@link DataRouter} to pass to {@link RouterProvider | `<RouterProvider>`}
  */
@@ -805,7 +857,7 @@ interface ClientOnErrorFunction {
     (error: unknown, info: {
         location: Location;
         params: Params;
-        unstable_pattern: string;
+        pattern: string;
         errorInfo?: React.ErrorInfo;
     }): void;
 }
@@ -839,7 +891,7 @@ interface RouterProviderProps {
      *
      * ```tsx
      * <RouterProvider onError=(error, info) => {
-     *   let { location, params, unstable_pattern, errorInfo } = info;
+     *   let { location, params, pattern, errorInfo } = info;
      *   console.error(error, location, errorInfo);
      *   reportToErrorService(error, location, errorInfo);
      * }} />
@@ -862,9 +914,9 @@ interface RouterProviderProps {
      * - When set to `false`, the router will not leverage `React.startTransition` or
      *   `React.useOptimistic` on any navigations or state changes.
      *
-     * For more information, please see the [docs](https://reactrouter.com/explanation/react-transitions).
+     * For more information, please see the [docs](../../explanation/react-transitions).
      */
-    unstable_useTransitions?: boolean;
+    useTransitions?: boolean;
 }
 /**
  * Render the UI for the given {@link DataRouter}. This component should
@@ -895,10 +947,10 @@ interface RouterProviderProps {
  * @param {RouterProviderProps.flushSync} props.flushSync n/a
  * @param {RouterProviderProps.onError} props.onError n/a
  * @param {RouterProviderProps.router} props.router n/a
- * @param {RouterProviderProps.unstable_useTransitions} props.unstable_useTransitions n/a
+ * @param {RouterProviderProps.useTransitions} props.useTransitions n/a
  * @returns React element for the rendered router
  */
-declare function RouterProvider({ router, flushSync: reactDomFlushSyncImpl, onError, unstable_useTransitions, }: RouterProviderProps): React.ReactElement;
+declare function RouterProvider({ router, flushSync: reactDomFlushSyncImpl, onError, useTransitions, }: RouterProviderProps): React.ReactElement;
 /**
  * @category Types
  */
@@ -931,9 +983,9 @@ interface MemoryRouterProps {
      * - When set to `false`, the router will not leverage `React.startTransition`
      *   on any navigations or state changes.
      *
-     * For more information, please see the [docs](https://reactrouter.com/explanation/react-transitions).
+     * For more information, please see the [docs](../../explanation/react-transitions).
      */
-    unstable_useTransitions?: boolean;
+    useTransitions?: boolean;
 }
 /**
  * A declarative {@link Router | `<Router>`} that stores all entries in memory.
@@ -946,11 +998,11 @@ interface MemoryRouterProps {
  * @param {MemoryRouterProps.children} props.children n/a
  * @param {MemoryRouterProps.initialEntries} props.initialEntries n/a
  * @param {MemoryRouterProps.initialIndex} props.initialIndex n/a
- * @param {MemoryRouterProps.unstable_useTransitions} props.unstable_useTransitions n/a
+ * @param {MemoryRouterProps.useTransitions} props.useTransitions n/a
  * @returns A declarative in-memory {@link Router | `<Router>`} for client-side
  * routing.
  */
-declare function MemoryRouter({ basename, children, initialEntries, initialIndex, unstable_useTransitions, }: MemoryRouterProps): React.ReactElement;
+declare function MemoryRouter({ basename, children, initialEntries, initialIndex, useTransitions, }: MemoryRouterProps): React.ReactElement;
 /**
  * @category Types
  */
@@ -1318,9 +1370,9 @@ interface RouterProps {
      * - When set to `false`, the router will not leverage `React.startTransition`
      *   on any navigations or state changes.
      *
-     * For more information, please see the [docs](https://reactrouter.com/explanation/react-transitions).
+     * For more information, please see the [docs](../../explanation/react-transitions).
      */
-    unstable_useTransitions?: boolean;
+    useTransitions?: boolean;
 }
 /**
  * Provides location context for the rest of the app.
@@ -1339,11 +1391,11 @@ interface RouterProps {
  * @param {RouterProps.navigationType} props.navigationType n/a
  * @param {RouterProps.navigator} props.navigator n/a
  * @param {RouterProps.static} props.static n/a
- * @param {RouterProps.unstable_useTransitions} props.unstable_useTransitions n/a
+ * @param {RouterProps.useTransitions} props.useTransitions n/a
  * @returns React element for the rendered router or `null` if the location does
  * not match the {@link props.basename}
  */
-declare function Router({ basename: basenameProp, children, location: locationProp, navigationType, navigator, static: staticProp, unstable_useTransitions, }: RouterProps): React.ReactElement | null;
+declare function Router({ basename: basenameProp, children, location: locationProp, navigationType, navigator, static: staticProp, useTransitions, }: RouterProps): React.ReactElement | null;
 /**
  * @category Types
  */
@@ -1636,7 +1688,7 @@ declare function withErrorBoundaryProps(ErrorBoundary: ErrorBoundaryType): () =>
     error: unknown;
 }, string | React.JSXElementConstructor<any>>;
 
-interface DataRouterContextObject extends Omit<NavigationContextObject, "future" | "unstable_useTransitions"> {
+interface DataRouterContextObject extends Omit<NavigationContextObject, "future" | "useTransitions"> {
     router: Router$1;
     staticContext?: StaticHandlerContext;
     onError?: ClientOnErrorFunction;
@@ -1660,7 +1712,7 @@ interface NavigateOptions {
     /** Replace the current entry in the history stack instead of pushing a new one */
     replace?: boolean;
     /** Masked URL */
-    unstable_mask?: To;
+    mask?: To;
     /** Adds persistent client side routing state to the next location */
     state?: any;
     /** If you are using {@link ScrollRestoration `<ScrollRestoration>`}, prevent the scroll position from being reset to the top of the window when navigating */
@@ -1672,7 +1724,7 @@ interface NavigateOptions {
     /** Enables a {@link https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API View Transition} for this navigation by wrapping the final state update in `document.startViewTransition()`. If you need to apply specific styles for this view transition, you will also need to leverage the {@link useViewTransitionState `useViewTransitionState()`} hook.  */
     viewTransition?: boolean;
     /** Specifies the default revalidation behavior after this submission */
-    unstable_defaultShouldRevalidate?: boolean;
+    defaultShouldRevalidate?: boolean;
 }
 /**
  * A Navigator is a "location changer"; it's how you get to different locations.
@@ -1694,7 +1746,7 @@ interface NavigationContextObject {
     basename: string;
     navigator: Navigator;
     static: boolean;
-    unstable_useTransitions: boolean | undefined;
+    useTransitions: boolean | undefined;
     future: {};
 }
 declare const NavigationContext: React.Context<NavigationContextObject>;
@@ -1710,4 +1762,4 @@ interface RouteContextObject {
 }
 declare const RouteContext: React.Context<RouteContextObject>;
 
-export { createRoutesFromElements as $, AwaitContextProvider as A, type BlockerFunction as B, type ClientOnErrorFunction as C, type RouteProps as D, type RouterProps as E, type Fetcher as F, type GetScrollPositionFunction as G, type HydrationState as H, IDLE_NAVIGATION as I, type RoutesProps as J, Await as K, type LayoutRouteProps as L, type MemoryRouterOpts as M, type NavigateOptions as N, type OutletProps as O, type PathRouteProps as P, MemoryRouter as Q, type RouterInit as R, type StaticHandler as S, Navigate as T, Outlet as U, Route as V, Router as W, RouterProvider as X, Routes as Y, createMemoryRouter as Z, createRoutesFromChildren as _, type RouterProviderProps as a, renderMatches as a0, createRouter as a1, DataRouterContext as a2, DataRouterStateContext as a3, FetchersContext as a4, LocationContext as a5, NavigationContext as a6, RouteContext as a7, ViewTransitionContext as a8, hydrationRouteProperties as a9, mapRouteProperties as aa, WithComponentProps as ab, withComponentProps as ac, WithHydrateFallbackProps as ad, withHydrateFallbackProps as ae, WithErrorBoundaryProps as af, withErrorBoundaryProps as ag, type FutureConfig as ah, type CreateStaticHandlerOptions as ai, type Router$1 as b, type Blocker as c, type RelativeRoutingType as d, type Navigation as e, type RouterState as f, type GetScrollRestorationKeyFunction as g, type StaticHandlerContext as h, type NavigationStates as i, type RouterSubscriber as j, type RouterNavigateOptions as k, type RouterFetchOptions as l, type RevalidationState as m, type unstable_ServerInstrumentation as n, type unstable_InstrumentRequestHandlerFunction as o, type unstable_InstrumentRouterFunction as p, type unstable_InstrumentRouteFunction as q, type unstable_InstrumentationHandlerResult as r, IDLE_FETCHER as s, IDLE_BLOCKER as t, type unstable_ClientInstrumentation as u, type Navigator as v, type AwaitProps as w, type IndexRouteProps as x, type MemoryRouterProps as y, type NavigateProps as z };
+export { createRoutesFromElements as $, AwaitContextProvider as A, type BlockerFunction as B, type ClientInstrumentation as C, type RouteProps as D, type RouterProps as E, type Fetcher as F, type GetScrollPositionFunction as G, type HydrationState as H, type InstrumentRequestHandlerFunction as I, type RoutesProps as J, Await as K, type LayoutRouteProps as L, type MemoryRouterOpts as M, type NavigateOptions as N, type OutletProps as O, type PathRouteProps as P, MemoryRouter as Q, type RouterInit as R, type StaticHandler as S, Navigate as T, Outlet as U, Route as V, Router as W, RouterProvider as X, Routes as Y, createMemoryRouter as Z, createRoutesFromChildren as _, type RouterProviderProps as a, renderMatches as a0, createRouter as a1, DataRouterContext as a2, DataRouterStateContext as a3, FetchersContext as a4, LocationContext as a5, NavigationContext as a6, RouteContext as a7, ViewTransitionContext as a8, hydrationRouteProperties as a9, mapRouteProperties as aa, WithComponentProps as ab, withComponentProps as ac, WithHydrateFallbackProps as ad, withHydrateFallbackProps as ae, WithErrorBoundaryProps as af, withErrorBoundaryProps as ag, type FutureConfig as ah, type CreateStaticHandlerOptions as ai, type ClientOnErrorFunction as b, type Router$1 as c, type Blocker as d, type RelativeRoutingType as e, type Navigation as f, type RouterState as g, type GetScrollRestorationKeyFunction as h, type StaticHandlerContext as i, type NavigationStates as j, type RouterSubscriber as k, type RouterNavigateOptions as l, type RouterFetchOptions as m, type RevalidationState as n, type ServerInstrumentation as o, type InstrumentRouterFunction as p, type InstrumentRouteFunction as q, type InstrumentationHandlerResult as r, IDLE_NAVIGATION as s, IDLE_FETCHER as t, IDLE_BLOCKER as u, type Navigator as v, type AwaitProps as w, type IndexRouteProps as x, type MemoryRouterProps as y, type NavigateProps as z };

package/dist/development/{routeModules-CM_clkdE.d.ts → data-BVUf681J.d.mts}

@@ -1,16 +1,6 @@
 import * as React from 'react';
 import { ComponentType, ReactElement } from 'react';
 
-/**
- * An augmentable interface users can modify in their app-code to opt into
- * future-flag-specific types
- */
-interface Future {
-}
-type MiddlewareEnabled = Future extends {
-    v8_middleware: infer T extends boolean;
-} ? T : false;
-
 /**
  * Actions represent the type of change to a location value.
  */
@@ -72,7 +62,7 @@ interface Location<State = any> extends Path {
      * The masked location displayed in the URL bar, which differs from the URL the
      * router is operating on
      */
-    unstable_mask: Path | undefined;
+    mask?: Path;
 }
 /**
  * A change to the current location.
@@ -265,6 +255,16 @@ type UrlHistoryOptions = {
     v5Compat?: boolean;
 };
 
+/**
+ * An augmentable interface users can modify in their app-code to opt into
+ * future-flag-specific types
+ */
+interface Future {
+}
+type MiddlewareEnabled = Future extends {
+    v8_middleware: infer T extends boolean;
+} ? T : false;
+
 type MaybePromise<T> = T | Promise<T>;
 /**
  * Map of routeId -> data returned from a loader/action/error
@@ -445,19 +445,19 @@ interface DataFunctionArgs<Context> {
     /** A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read headers (like cookies, and {@link https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams URLSearchParams} from the request. */
     request: Request;
     /**
-     * A URL instance representing the application location being navigated to or fetched.
-     * Without `future.unstable_passThroughRequests` enabled, this matches `request.url`.
-     * With `future.unstable_passThroughRequests` enabled, this is a normalized
-     * URL with React-Router-specific implementation details removed (`.data`
-     * suffixes, `index`/`_routes` search params).
-     * The URL includes the origin from the request for convenience.
+     * A URL instance representing the application location being navigated to or
+     * fetched. By default, this matches `request.url`.
+     *
+     * In Framework mode with `future.v8_passThroughRequests` enabled, this is a
+     * normalized URL with React-Router-specific implementation details removed
+     * (`.data` suffixes, `index`/`_routes` search params).
      */
-    unstable_url: URL;
+    url: URL;
     /**
      * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
      * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
      */
-    unstable_pattern: string;
+    pattern: string;
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -846,13 +846,30 @@ type DataNonIndexRouteObject = NonIndexRouteObject & {
 type DataRouteObject = DataIndexRouteObject | DataNonIndexRouteObject;
 type RouteManifest<R = DataRouteObject> = Record<string, R | undefined>;
 type Regex_az = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" | "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | "s" | "t" | "u" | "v" | "w" | "x" | "y" | "z";
-type Regez_AZ = "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | "I" | "J" | "K" | "L" | "M" | "N" | "O" | "P" | "Q" | "R" | "S" | "T" | "U" | "V" | "W" | "X" | "Y" | "Z";
+type Regex_AZ = Uppercase<Regex_az>;
 type Regex_09 = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9";
-type Regex_w = Regex_az | Regez_AZ | Regex_09 | "_";
-type ParamChar = Regex_w | "-";
-type RegexMatchPlus<CharPattern extends string, T extends string> = T extends `${infer First}${infer Rest}` ? First extends CharPattern ? RegexMatchPlus<CharPattern, Rest> extends never ? First : `${First}${RegexMatchPlus<CharPattern, Rest>}` : never : never;
-type _PathParam<Path extends string> = Path extends `${infer L}/${infer R}` ? _PathParam<L> | _PathParam<R> : Path extends `:${infer Param}` ? Param extends `${infer Optional}?${string}` ? RegexMatchPlus<ParamChar, Optional> : RegexMatchPlus<ParamChar, Param> : never;
-type PathParam<Path extends string> = Path extends "*" | "/*" ? "*" : Path extends `${infer Rest}/*` ? "*" | _PathParam<Rest> : _PathParam<Path>;
+type Regex_w = Regex_az | Regex_AZ | Regex_09 | "_";
+/** Emulates Regex `+` operator */
+type RegexMatchPlus<char extends string, T extends string> = _RegexMatchPlus<char, T> extends infer result extends string ? result extends '' ? never : result : never;
+type _RegexMatchPlus<char extends string, T extends string> = T extends `${infer head extends char}${infer rest}` ? `${head}${_RegexMatchPlus<char, rest>}` : '';
+type ParamNameChar = Regex_w | "-";
+type Simplify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+type GeneratePathParams<path extends string> = Simplify<ParseParams<path> & {
+    [key in string]: string | null | undefined;
+}>;
+type ParseParams<path extends string> = path extends '*' ? {
+    '*': string;
+} : path extends `${infer rest}/*` ? {
+    '*': string;
+} & ParseParams<rest> : _ParseParams<path>;
+type _ParseParams<path extends string> = path extends `${infer left}/${infer right}` ? _ParseParams<left> & _ParseParams<right> : path extends `:${infer param}?${string}` ? {
+    [key in RegexMatchPlus<ParamNameChar, param>]?: string | null | undefined;
+} : path extends `:${infer param}` ? {
+    [key in RegexMatchPlus<ParamNameChar, param>]: string;
+} : {};
+type PathParam<path extends string> = (keyof ParseParams<path>) & string;
 type ParamParseKey<Segment extends string> = [
     PathParam<Segment>
 ] extends [never] ? string : PathParam<Segment>;
@@ -939,6 +956,24 @@ interface UIMatch<Data = unknown, Handle = unknown> {
      */
     handle: Handle;
 }
+interface RouteMeta<RouteObjectType extends RouteObject = RouteObject> {
+    relativePath: string;
+    caseSensitive: boolean;
+    childrenIndex: number;
+    route: RouteObjectType;
+}
+/**
+ * @private
+ * PRIVATE - DO NOT USE
+ *
+ * A "branch" of routes that match a given route pattern.
+ * This is an internal interface not intended for direct external usage.
+ */
+interface RouteBranch<RouteObjectType extends RouteObject = RouteObject> {
+    path: string;
+    score: number;
+    routesMeta: RouteMeta<RouteObjectType>[];
+}
 /**
  * Returns a path with params interpolated.
  *
@@ -953,9 +988,7 @@ interface UIMatch<Data = unknown, Handle = unknown> {
  * @param params The parameters to interpolate into the path.
  * @returns The generated path with parameters interpolated.
  */
-declare function generatePath<Path extends string>(originalPath: Path, params?: {
-    [key in PathParam<Path>]: string | null;
-}): string;
+declare function generatePath<Path extends string>(originalPath: Path, params?: GeneratePathParams<Path>): string;
 /**
  * Used to match on some portion of a URL pathname.
  */
@@ -1011,7 +1044,7 @@ interface PathMatch<ParamKey extends string = string> {
  * @returns A path match object if the pattern matches the pathname,
  * or `null` if it does not match.
  */
-declare function matchPath<ParamKey extends ParamParseKey<Path>, Path extends string>(pattern: PathPattern<Path> | Path, pathname: string): PathMatch<ParamKey> | null;
+declare function matchPath<Path extends string>(pattern: PathPattern<Path> | Path, pathname: string): PathMatch<ParamParseKey<Path>> | null;
 /**
  * Returns a resolved {@link Path} object relative to the given pathname.
  *
@@ -1199,16 +1232,6 @@ declare class ErrorResponseImpl implements ErrorResponse {
  */
 declare function isRouteErrorResponse(error: any): error is ErrorResponse;
 
-/**
- * An object of unknown type for route loaders and actions provided by the
- * server's `getLoadContext()` function.  This is defined as an empty interface
- * specifically so apps can leverage declaration merging to augment this type
- * globally: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
- */
-interface AppLoadContext {
-    [key: string]: unknown;
-}
-
 type Primitive = null | undefined | string | number | boolean | symbol | bigint;
 type LiteralUnion<LiteralType, BaseType extends Primitive> = LiteralType | (BaseType & Record<never, never>);
 interface HtmlLinkProps {
@@ -1380,14 +1403,14 @@ type ClientDataFunctionArgs<Params> = {
      **/
     request: Request;
     /**
-     * A URL instance representing the application location being navigated to or fetched.
-     * Without `future.unstable_passThroughRequests` enabled, this matches `request.url`.
-     * With `future.unstable_passThroughRequests` enabled, this is a normalized
-     * URL with React-Router-specific implementation details removed (`.data`
-     * pathnames, `index`/`_routes` search params).
-     * The URL includes the origin from the request for convenience.
+     * A URL instance representing the application location being navigated to or
+     * fetched. By default, this matches `request.url`.
+     *
+     * In Framework mode with `future.v8_passThroughRequests` enabled, this is a
+     * normalized URL with React-Router-specific implementation details removed
+     * (`.data` suffixes, `index`/`_routes` search params).
      */
-    unstable_url: URL;
+    url: URL;
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -1407,7 +1430,7 @@ type ClientDataFunctionArgs<Params> = {
      * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
      * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
      */
-    unstable_pattern: string;
+    pattern: string;
     /**
      * When `future.v8_middleware` is not enabled, this is undefined.
      *
@@ -1422,14 +1445,14 @@ type ServerDataFunctionArgs<Params> = {
     /** A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read the url, method, headers (such as cookies), and request body from the request. */
     request: Request;
     /**
-     * A URL instance representing the application location being navigated to or fetched.
-     * Without `future.unstable_passThroughRequests` enabled, this matches `request.url`.
-     * With `future.unstable_passThroughRequests` enabled, this is a normalized
-     * URL with React-Router-specific implementation details removed (`.data`
-     * pathnames, `index`/`_routes` search params).
-     * The URL includes the origin from the request for convenience.
+     * A URL instance representing the application location being navigated to or
+     * fetched. By default, this matches `request.url`.
+     *
+     * In Framework mode with `future.v8_passThroughRequests` enabled, this is a
+     * normalized URL with React-Router-specific implementation details removed
+     * (`.data` suffixes, `index`/`_routes` search params).
      */
-    unstable_url: URL;
+    url: URL;
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -1449,7 +1472,7 @@ type ServerDataFunctionArgs<Params> = {
      * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
      * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
      */
-    unstable_pattern: string;
+    pattern: string;
     /**
      * Without `future.v8_middleware` enabled, this is the context passed in
      * to your server adapter's `getLoadContext` function. It's a way to bridge the
@@ -1696,4 +1719,14 @@ type RouteComponent = ComponentType<{}>;
  */
 type RouteHandle = unknown;
 
-export { type BaseRouteObject as $, type ActionFunction as A, type DataStrategyResult as B, type ClientActionFunction as C, type DataRouteMatch as D, type ServerDataFrom as E, type FormEncType as F, type GetLoaderData as G, type HeadersFunction as H, type GetActionData as I, type RouteModules as J, type SerializeFrom as K, type Location as L, type MetaFunction as M, type Normalize as N, type ParamParseKey as O, type Params as P, type PathPattern as Q, type RouteModule$1 as R, type ShouldRevalidateFunction as S, type To as T, type UIMatch as U, type PathMatch as V, type InitialEntry as W, type IndexRouteObject as X, type NonIndexRouteObject as Y, type Equal as Z, type ActionFunctionArgs as _, type ClientLoaderFunction as a, type DataStrategyFunctionArgs as a0, type DataStrategyMatch as a1, DataWithResponseInit as a2, type ErrorResponse as a3, type FormMethod as a4, type LazyRouteFunction as a5, type MiddlewareFunction as a6, type PatchRoutesOnNavigationFunctionArgs as a7, type PathParam as a8, type RedirectFunction as a9, invariant as aA, ErrorResponseImpl as aB, type RouteManifest as aC, type ServerRouteModule as aD, type TrackedPromise as aE, type RouteMatch as aa, type RouterContext as ab, type ShouldRevalidateFunctionArgs as ac, createContext as ad, createPath as ae, parsePath as af, data as ag, generatePath as ah, isRouteErrorResponse as ai, matchPath as aj, matchRoutes as ak, redirect as al, redirectDocument as am, replace as an, resolvePath as ao, type ClientActionFunctionArgs as ap, type ClientLoaderFunctionArgs as aq, type HeadersArgs as ar, type MetaArgs as as, type PageLinkDescriptor as at, type HtmlLinkDescriptor as au, type Future as av, type unstable_SerializesTo as aw, createMemoryHistory as ax, createBrowserHistory as ay, createHashHistory as az, type LinksFunction as b, RouterContextProvider as c, type LoaderFunction as d, type RouteObject as e, type History as f, type MaybePromise as g, type MapRoutePropertiesFunction as h, Action as i, type Submission as j, type RouteData as k, type DataStrategyFunction as l, type PatchRoutesOnNavigationFunction as m, type DataRouteObject as n, type HTMLFormMethod as o, type Path as p, type LoaderFunctionArgs as q, type MiddlewareEnabled as r, type AppLoadContext as s, type LinkDescriptor as t, type Func as u, type Pretty as v, type MetaDescriptor as w, type ServerDataFunctionArgs as x, type MiddlewareNextFunction as y, type ClientDataFunctionArgs as z };
+/**
+ * An object of unknown type for route loaders and actions provided by the
+ * server's `getLoadContext()` function.  This is defined as an empty interface
+ * specifically so apps can leverage declaration merging to augment this type
+ * globally: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
+ */
+interface AppLoadContext {
+    [key: string]: unknown;
+}
+
+export { type PathPattern as $, type ActionFunction as A, type PatchRoutesOnNavigationFunction as B, type ClientActionFunction as C, type DataStrategyResult as D, type DataRouteObject as E, type Func as F, type GetLoaderData as G, type HeadersFunction as H, type RouteBranch as I, type RouteManifest as J, type Path as K, type Location as L, type MetaFunction as M, type Normalize as N, type InitialEntry as O, type Params as P, type NonIndexRouteObject as Q, type RouteModule$1 as R, type ShouldRevalidateFunction as S, type To as T, type UIMatch as U, type LazyRouteFunction as V, type IndexRouteObject as W, type RouteMatch as X, type TrackedPromise as Y, type RouteModules as Z, type SerializeFrom as _, type ClientLoaderFunction as a, type PathMatch as a0, type ParamParseKey as a1, type Equal as a2, type ActionFunctionArgs as a3, type BaseRouteObject as a4, type DataStrategyFunctionArgs as a5, type DataStrategyMatch as a6, DataWithResponseInit as a7, type ErrorResponse as a8, type FormMethod as a9, createMemoryHistory as aA, createBrowserHistory as aB, createHashHistory as aC, invariant as aD, ErrorResponseImpl as aE, type ServerRouteModule as aF, type MiddlewareFunction as aa, type PatchRoutesOnNavigationFunctionArgs as ab, type PathParam as ac, type RedirectFunction as ad, type RouterContext as ae, type ShouldRevalidateFunctionArgs as af, createContext as ag, createPath as ah, parsePath as ai, data as aj, generatePath as ak, isRouteErrorResponse as al, matchPath as am, matchRoutes as an, redirect as ao, redirectDocument as ap, replace as aq, resolvePath as ar, type ClientActionFunctionArgs as as, type ClientLoaderFunctionArgs as at, type HeadersArgs as au, type MetaArgs as av, type PageLinkDescriptor as aw, type HtmlLinkDescriptor as ax, type Future as ay, type unstable_SerializesTo as az, type LinksFunction as b, RouterContextProvider as c, type LoaderFunction as d, type LinkDescriptor as e, type Pretty as f, type MetaDescriptor as g, type ServerDataFunctionArgs as h, type MiddlewareNextFunction as i, type ClientDataFunctionArgs as j, type ServerDataFrom as k, type GetActionData as l, type HTMLFormMethod as m, type FormEncType as n, type LoaderFunctionArgs as o, type MiddlewareEnabled as p, type AppLoadContext as q, type RouteObject as r, type History as s, type MaybePromise as t, type MapRoutePropertiesFunction as u, Action as v, type DataRouteMatch as w, type Submission as x, type RouteData as y, type DataStrategyFunction as z };