add star pattern

Author: rmorshea

.github/workflows/test.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Install Python Dependencies
         run: pip install -r requirements/nox-deps.txt
       - name: Run Tests
-        run: nox -s test
+        run: nox -t test
 
   environments:
     runs-on: ubuntu-latest
@@ -36,4 +36,4 @@ jobs:
       - name: Install Python Dependencies
         run: pip install -r requirements/nox-deps.txt
       - name: Run Tests
-        run: nox -s test -- --no-cov
+        run: nox -t test -- --no-cov

noxfile.py

@@ -8,7 +8,7 @@
 
 @session
 def format(session: Session) -> None:
-    install_requirements(session, "style")
+    install_requirements(session, "check-style")
     session.run("black", ".")
     session.run("isort", ".")
 
@@ -25,29 +25,21 @@ def docs_build(session: Session) -> None:
     session.run("mkdocs", "build")
 
 
-@session
-def test(session: Session) -> None:
-    session.notify("test_style")
-    session.notify("test_types")
-    session.notify("test_suite")
-    session.notify("test_javascript")
-
-
-@session
+@session(tags=["test"])
 def test_style(session: Session) -> None:
     install_requirements(session, "check-style")
     session.run("black", "--check", ".")
     session.run("isort", "--check", ".")
     session.run("flake8", ".")
 
 
-@session
+@session(tags=["test"])
 def test_types(session: Session) -> None:
     install_requirements(session, "check-types")
     session.run("mypy", "--strict", "reactpy_router")
 
 
-@session
+@session(tags=["test"])
 def test_suite(session: Session) -> None:
     install_requirements(session, "test-env")
     session.run("playwright", "install", "chromium")
@@ -65,7 +57,7 @@ def test_suite(session: Session) -> None:
     session.run("pytest", "tests", *posargs)
 
 
-@session
+@session(tags=["test"])
 def test_javascript(session: Session) -> None:
     session.chdir(ROOT / "js")
     session.run("npm", "install", external=True)

reactpy_router/core.py

@@ -10,6 +10,7 @@
 from reactpy import (
     component,
     create_context,
+    html,
     use_context,
     use_location,
     use_memo,
@@ -20,7 +21,6 @@
 from reactpy.core.types import VdomChild, VdomDict
 from reactpy.types import ComponentType, Context, Location
 from reactpy.web.module import export, module_from_file
-from reactpy import html
 
 from reactpy_router.types import Route, RouteCompiler, Router, RouteResolver
 
@@ -45,7 +45,7 @@ def wrapper(*routes: R) -> ComponentType:
 def router_component(
     *routes: R,
     compiler: RouteCompiler[R],
-) -> ComponentType | None:
+) -> VdomDict | None:
     """A component that renders the first matching route using the given compiler"""
 
     old_conn = use_connection()

reactpy_router/simple.py

@@ -16,8 +16,8 @@
 ConversionFunc: TypeAlias = "Callable[[str], Any]"
 ConverterMapping: TypeAlias = "dict[str, ConversionFunc]"
 
-PARAM_REGEX = re.compile(r"{(?P<name>\w+)(?P<type>:\w+)?}")
-"""Regex for matching path params"""
+STAR_PATTERN = re.compile("^.*$")
+PARAM_PATTERN = re.compile(r"{(?P<name>\w+)(?P<type>:\w+)?}")
 
 
 class SimpleResolver:
@@ -39,14 +39,13 @@ def resolve(self, path: str) -> tuple[Any, dict[str, Any]] | None:
 
 
 def parse_path(path: str) -> tuple[re.Pattern[str], ConverterMapping]:
-    """Parse a path into a regex pattern and a mapping of converters"""
     if path == "*":
-        return re.compile(".*"), {}
+        return STAR_PATTERN, {}
 
     pattern = "^"
     last_match_end = 0
     converters: ConverterMapping = {}
-    for match in PARAM_REGEX.finditer(path):
+    for match in PARAM_PATTERN.finditer(path):
         param_name = match.group("name")
         param_type = (match.group("type") or "str").lstrip(":")
         try:

tests/test_simple.py

@@ -50,5 +50,5 @@ def test_parse_path_re_escape():
     )
 
 
-def test_match_any_path():
+def test_match_star_path():
     assert parse_path("*") == (re.compile(".*"), {})