77from typing import TYPE_CHECKING , Any , Literal , cast
88
99from reactpy import component , use_memo , use_state
10- from reactpy .backend .hooks import ConnectionContext , use_connection
1110from reactpy .backend .types import Connection , Location
11+ from reactpy .core .hooks import ConnectionContext , use_connection
1212from reactpy .types import ComponentType , VdomDict
1313
1414from reactpy_router .components import FirstLoad , History
2020
2121 from reactpy .core .component import Component
2222
23- from reactpy_router .types import CompiledRoute , Resolver , Router , RouteType
23+ from reactpy_router .types import CompiledRoute , Resolver , Route , Router
2424
2525__all__ = ["browser_router" , "create_router" ]
2626_logger = getLogger (__name__ )
2727
2828
29- def create_router (resolver : Resolver [RouteType ]) -> Router [RouteType ]:
29+ def create_router (resolver : Resolver [Route ]) -> Router [Route ]:
3030 """A decorator that turns a resolver into a router"""
3131
32- def wrapper (* routes : RouteType ) -> Component :
32+ def wrapper (* routes : Route ) -> Component :
3333 return router (* routes , resolver = resolver )
3434
3535 return wrapper
@@ -38,13 +38,13 @@ def wrapper(*routes: RouteType) -> Component:
3838_starlette_router = create_router (StarletteResolver )
3939
4040
41- def browser_router (* routes : RouteType ) -> Component :
41+ def browser_router (* routes : Route ) -> Component :
4242 """This is the recommended router for all ReactPy-Router web projects.
4343 It uses the JavaScript [History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API)
4444 to manage the history stack.
4545
4646 Args:
47- *routes (RouteType ): A list of routes to be rendered by the router.
47+ *routes (Route ): A list of routes to be rendered by the router.
4848
4949 Returns:
5050 A router component that renders the given routes.
@@ -54,8 +54,8 @@ def browser_router(*routes: RouteType) -> Component:
5454
5555@component
5656def router (
57- * routes : RouteType ,
58- resolver : Resolver [RouteType ],
57+ * routes : Route ,
58+ resolver : Resolver [Route ],
5959) -> VdomDict | None :
6060 """A component that renders matching route(s) using the given resolver.
6161
@@ -110,7 +110,7 @@ def on_first_load(event: dict[str, Any]) -> None:
110110 return None
111111
112112
113- def _iter_routes (routes : Sequence [RouteType ]) -> Iterator [RouteType ]:
113+ def _iter_routes (routes : Sequence [Route ]) -> Iterator [Route ]:
114114 for parent in routes :
115115 for child in _iter_routes (parent .routes ):
116116 yield replace (child , path = parent .path + child .path ) # type: ignore[misc]
0 commit comments