react-router 7.4.1 → 7.5.0-pre.0

package/dist/development/{route-data-BL8ToWby.d.ts → route-data-5OzAzQtT.d.mts}

@@ -463,25 +463,33 @@ interface MapRoutePropertiesFunction {
         hasErrorBoundary: boolean;
     } & Record<string, any>;
 }
+/**
+ * Keys we cannot change from within a lazy object. We spread all other keys
+ * onto the route. Either they're meaningful to the router, or they'll get
+ * ignored.
+ */
+type UnsupportedLazyRouteObjectKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "children";
 /**
  * Keys we cannot change from within a lazy() function. We spread all other keys
  * onto the route. Either they're meaningful to the router, or they'll get
  * ignored.
  */
-type UnsupportedLazyRouteFunctionKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "unstable_middleware" | "unstable_lazyMiddleware" | "children";
-type RequireOne<T, Key = keyof T> = Exclude<{
-    [K in keyof T]: K extends Key ? Omit<T, K> & Required<Pick<T, K>> : never;
-}[keyof T], undefined>;
+type UnsupportedLazyRouteFunctionKey = UnsupportedLazyRouteObjectKey | "unstable_middleware";
+/**
+ * lazy object to load route properties, which can add non-matching
+ * related properties to a route
+ */
+type LazyRouteObject<R extends AgnosticRouteObject> = {
+    [K in keyof R as K extends UnsupportedLazyRouteObjectKey ? never : K]?: () => Promise<R[K] | null | undefined>;
+};
 /**
  * lazy() function to load a route definition, which can add non-matching
  * related properties to a route
  */
 interface LazyRouteFunction<R extends AgnosticRouteObject> {
-    (): Promise<RequireOne<Omit<R, UnsupportedLazyRouteFunctionKey>>>;
-}
-interface LazyMiddlewareFunction {
-    (): Promise<unstable_MiddlewareFunction[]>;
+    (): Promise<Omit<R, UnsupportedLazyRouteFunctionKey> & Partial<Record<UnsupportedLazyRouteFunctionKey, never>>>;
 }
+type LazyRouteDefinition<R extends AgnosticRouteObject> = LazyRouteObject<R> | LazyRouteFunction<R>;
 /**
  * Base RouteObject with common props shared by all types of routes
  */
@@ -490,13 +498,12 @@ type AgnosticBaseRouteObject = {
     path?: string;
     id?: string;
     unstable_middleware?: unstable_MiddlewareFunction[];
-    unstable_lazyMiddleware?: LazyMiddlewareFunction;
     loader?: LoaderFunction | boolean;
     action?: ActionFunction | boolean;
     hasErrorBoundary?: boolean;
     shouldRevalidate?: ShouldRevalidateFunction;
     handle?: any;
-    lazy?: LazyRouteFunction<AgnosticBaseRouteObject>;
+    lazy?: LazyRouteDefinition<AgnosticBaseRouteObject>;
 };
 /**
  * Index routes must not have children
@@ -1255,7 +1262,6 @@ interface IndexRouteObject {
     path?: AgnosticIndexRouteObject["path"];
     id?: AgnosticIndexRouteObject["id"];
     unstable_middleware?: AgnosticIndexRouteObject["unstable_middleware"];
-    unstable_lazyMiddleware?: AgnosticIndexRouteObject["unstable_lazyMiddleware"];
     loader?: AgnosticIndexRouteObject["loader"];
     action?: AgnosticIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticIndexRouteObject["hasErrorBoundary"];
@@ -1269,14 +1275,13 @@ interface IndexRouteObject {
     Component?: React.ComponentType | null;
     HydrateFallback?: React.ComponentType | null;
     ErrorBoundary?: React.ComponentType | null;
-    lazy?: LazyRouteFunction<RouteObject>;
+    lazy?: LazyRouteDefinition<RouteObject>;
 }
 interface NonIndexRouteObject {
     caseSensitive?: AgnosticNonIndexRouteObject["caseSensitive"];
     path?: AgnosticNonIndexRouteObject["path"];
     id?: AgnosticNonIndexRouteObject["id"];
     unstable_middleware?: AgnosticNonIndexRouteObject["unstable_middleware"];
-    unstable_lazyMiddleware?: AgnosticNonIndexRouteObject["unstable_lazyMiddleware"];
     loader?: AgnosticNonIndexRouteObject["loader"];
     action?: AgnosticNonIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticNonIndexRouteObject["hasErrorBoundary"];
@@ -1290,7 +1295,7 @@ interface NonIndexRouteObject {
     Component?: React.ComponentType | null;
     HydrateFallback?: React.ComponentType | null;
     ErrorBoundary?: React.ComponentType | null;
-    lazy?: LazyRouteFunction<RouteObject>;
+    lazy?: LazyRouteDefinition<RouteObject>;
 }
 type RouteObject = IndexRouteObject | NonIndexRouteObject;
 type DataRouteObject = RouteObject & {

package/dist/{production/route-data-BL8ToWby.d.mts → development/route-data-5OzAzQtT.d.ts}

@@ -463,25 +463,33 @@ interface MapRoutePropertiesFunction {
         hasErrorBoundary: boolean;
     } & Record<string, any>;
 }
+/**
+ * Keys we cannot change from within a lazy object. We spread all other keys
+ * onto the route. Either they're meaningful to the router, or they'll get
+ * ignored.
+ */
+type UnsupportedLazyRouteObjectKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "children";
 /**
  * Keys we cannot change from within a lazy() function. We spread all other keys
  * onto the route. Either they're meaningful to the router, or they'll get
  * ignored.
  */
-type UnsupportedLazyRouteFunctionKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "unstable_middleware" | "unstable_lazyMiddleware" | "children";
-type RequireOne<T, Key = keyof T> = Exclude<{
-    [K in keyof T]: K extends Key ? Omit<T, K> & Required<Pick<T, K>> : never;
-}[keyof T], undefined>;
+type UnsupportedLazyRouteFunctionKey = UnsupportedLazyRouteObjectKey | "unstable_middleware";
+/**
+ * lazy object to load route properties, which can add non-matching
+ * related properties to a route
+ */
+type LazyRouteObject<R extends AgnosticRouteObject> = {
+    [K in keyof R as K extends UnsupportedLazyRouteObjectKey ? never : K]?: () => Promise<R[K] | null | undefined>;
+};
 /**
  * lazy() function to load a route definition, which can add non-matching
  * related properties to a route
  */
 interface LazyRouteFunction<R extends AgnosticRouteObject> {
-    (): Promise<RequireOne<Omit<R, UnsupportedLazyRouteFunctionKey>>>;
-}
-interface LazyMiddlewareFunction {
-    (): Promise<unstable_MiddlewareFunction[]>;
+    (): Promise<Omit<R, UnsupportedLazyRouteFunctionKey> & Partial<Record<UnsupportedLazyRouteFunctionKey, never>>>;
 }
+type LazyRouteDefinition<R extends AgnosticRouteObject> = LazyRouteObject<R> | LazyRouteFunction<R>;
 /**
  * Base RouteObject with common props shared by all types of routes
  */
@@ -490,13 +498,12 @@ type AgnosticBaseRouteObject = {
     path?: string;
     id?: string;
     unstable_middleware?: unstable_MiddlewareFunction[];
-    unstable_lazyMiddleware?: LazyMiddlewareFunction;
     loader?: LoaderFunction | boolean;
     action?: ActionFunction | boolean;
     hasErrorBoundary?: boolean;
     shouldRevalidate?: ShouldRevalidateFunction;
     handle?: any;
-    lazy?: LazyRouteFunction<AgnosticBaseRouteObject>;
+    lazy?: LazyRouteDefinition<AgnosticBaseRouteObject>;
 };
 /**
  * Index routes must not have children
@@ -1255,7 +1262,6 @@ interface IndexRouteObject {
     path?: AgnosticIndexRouteObject["path"];
     id?: AgnosticIndexRouteObject["id"];
     unstable_middleware?: AgnosticIndexRouteObject["unstable_middleware"];
-    unstable_lazyMiddleware?: AgnosticIndexRouteObject["unstable_lazyMiddleware"];
     loader?: AgnosticIndexRouteObject["loader"];
     action?: AgnosticIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticIndexRouteObject["hasErrorBoundary"];
@@ -1269,14 +1275,13 @@ interface IndexRouteObject {
     Component?: React.ComponentType | null;
     HydrateFallback?: React.ComponentType | null;
     ErrorBoundary?: React.ComponentType | null;
-    lazy?: LazyRouteFunction<RouteObject>;
+    lazy?: LazyRouteDefinition<RouteObject>;
 }
 interface NonIndexRouteObject {
     caseSensitive?: AgnosticNonIndexRouteObject["caseSensitive"];
     path?: AgnosticNonIndexRouteObject["path"];
     id?: AgnosticNonIndexRouteObject["id"];
     unstable_middleware?: AgnosticNonIndexRouteObject["unstable_middleware"];
-    unstable_lazyMiddleware?: AgnosticNonIndexRouteObject["unstable_lazyMiddleware"];
     loader?: AgnosticNonIndexRouteObject["loader"];
     action?: AgnosticNonIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticNonIndexRouteObject["hasErrorBoundary"];
@@ -1290,7 +1295,7 @@ interface NonIndexRouteObject {
     Component?: React.ComponentType | null;
     HydrateFallback?: React.ComponentType | null;
     ErrorBoundary?: React.ComponentType | null;
-    lazy?: LazyRouteFunction<RouteObject>;
+    lazy?: LazyRouteDefinition<RouteObject>;
 }
 type RouteObject = IndexRouteObject | NonIndexRouteObject;
 type DataRouteObject = RouteObject & {