entrygraph 0.1.44__tar.gz → 0.1.46__tar.gz

{entrygraph-0.1.44 → entrygraph-0.1.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entrygraph
-Version: 0.1.44
+Version: 0.1.46
 Summary: Language-agnostic code graph: query symbols, entrypoints, and source-to-sink call paths from a SQLite index
 Project-URL: Repository, https://github.com/brettbergin/entrygraph
 Author-email: Brett Bergin <brettberginbc@yahoo.com>

{entrygraph-0.1.44 → entrygraph-0.1.46}/src/entrygraph/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.44'
-__version_tuple__ = version_tuple = (0, 1, 44)
+__version__ = version = '0.1.46'
+__version_tuple__ = version_tuple = (0, 1, 46)
 
 __commit_id__ = commit_id = None

{entrygraph-0.1.44 → entrygraph-0.1.46}/src/entrygraph/detect/entrypoints/php.py

@@ -14,6 +14,7 @@ import re
 
 from entrygraph.detect.entrypoints.base import (
     EntrypointRule,
+    compose_route,
     first_string_arg,
     register,
 )
@@ -23,6 +24,12 @@ from entrygraph.kinds import EntrypointKind, SymbolKind
 _LARAVEL_VERBS = frozenset({"get", "post", "put", "delete", "patch", "any", "match"})
 _LARAVEL_RESOURCE = frozenset({"resource", "apiResource"})
 _SYMFONY_ROUTE = re.compile(r"#\[\s*Route\s*\(")
+# Symfony route paths can be positional (`#[Route('/x')]`) or the `path:` named arg
+# (`#[Route(path: '/x')]`); methods live in `methods: ['GET', 'POST']` (or a bare
+# string). `first_string_arg` covers the positional case.
+_SYMFONY_PATH_KW = re.compile(r"""path\s*:\s*['"]([^'"]+)['"]""")
+_SYMFONY_METHODS = re.compile(r"""methods\s*:\s*(?:\[([^\]]*)\]|['"]([^'"]+)['"])""")
+_QUOTED_RE = re.compile(r"""['"]([^'"]+)['"]""")
 _WORDPRESS_HOOKS = frozenset({"add_action", "add_filter"})
 # register_rest_route($namespace, $route, ...). Anchor to the first two positional
 # args: arg 1 is the namespace (a literal like 'wp/v2' or a variable such as
@@ -160,20 +167,50 @@ def _laravel_routes(x: FileExtraction) -> list[EntrypointHint]:
     return hints
 
 
+def _symfony_path(decorator: str) -> str | None:
+    """The route path from a `#[Route(...)]` attribute: the `path:` named arg if
+    present, else the first positional string."""
+    m = _SYMFONY_PATH_KW.search(decorator)
+    return m.group(1) if m else first_string_arg(decorator)
+
+
+def _symfony_methods(decorator: str) -> list[str]:
+    """HTTP verbs from `methods: ['GET', 'POST']` / `methods: 'GET'`; empty if the
+    attribute omits `methods` (Symfony then allows all verbs)."""
+    m = _SYMFONY_METHODS.search(decorator)
+    if not m:
+        return []
+    body = m.group(1) if m.group(1) is not None else m.group(2)
+    verbs = [q.upper() for q in _QUOTED_RE.findall(body)]
+    if not verbs and body.strip():  # unquoted single value
+        verbs = [body.strip().upper()]
+    return verbs
+
+
 def _symfony_routes(x: FileExtraction) -> list[EntrypointHint]:
+    # class qname -> class-level #[Route(...)] path prefix (composed onto each
+    # method route, mirroring @Controller in NestJS and @RequestMapping in Spring).
+    prefixes: dict[str, str] = {}
+    for symbol in x.symbols:
+        if symbol.kind is SymbolKind.CLASS:
+            for decorator in symbol.decorators:
+                if _SYMFONY_ROUTE.search(decorator):
+                    prefixes[symbol.qualified_name] = _symfony_path(decorator) or ""
+                    break
     hints = []
     for symbol in x.symbols:
         if symbol.kind not in (SymbolKind.METHOD, SymbolKind.FUNCTION):
             continue
         for decorator in symbol.decorators:
             if _SYMFONY_ROUTE.search(decorator):
+                prefix = prefixes.get(symbol.parent_qualified_name or "", "")
                 hints.append(
                     EntrypointHint(
                         rule_id="php.symfony.route",
                         kind=EntrypointKind.HTTP_ROUTE,
                         handler_qualified_name=symbol.qualified_name,
-                        route=first_string_arg(decorator) or "",
-                        http_methods=["*"],
+                        route=compose_route(prefix, _symfony_path(decorator)),
+                        http_methods=_symfony_methods(decorator) or ["*"],
                         framework="symfony",
                     )
                 )

{entrygraph-0.1.44 → entrygraph-0.1.46}/src/entrygraph/detect/entrypoints/rust.py

@@ -15,6 +15,7 @@ import re
 
 from entrygraph.detect.entrypoints.base import (
     EntrypointRule,
+    compose_route,
     first_string_arg,
     register,
 )
@@ -58,10 +59,36 @@ def _rust_main(x: FileExtraction) -> list[EntrypointHint]:
     return hints
 
 
+_AXUM_NEST_FN = re.compile(r",\s*([A-Za-z_]\w*)\s*\(")  # 2nd arg of nest: funcName(
+
+
+def _axum_nest_prefixes(x: FileExtraction) -> dict[str, str]:
+    """Map a router-builder function to the prefix it's nested under:
+    `.nest("/admin", admin_routes())` -> {admin_routes: "/admin"} (#36).
+
+    axum's other nest form, `.nest("/x", router_var)`, mounts a router built inline
+    in the same function as everything else, so its routes can't be told apart by
+    caller — that variable form stays out of static reach.
+    """
+    prefixes: dict[str, str] = {}
+    for ref in x.references:
+        if ref.kind != "call" or ref.callee_name != "nest" or not ref.arg_preview:
+            continue
+        prefix = first_string_arg("(" + ref.arg_preview.lstrip("("))
+        if prefix is None or not prefix.startswith("/"):
+            continue
+        m = _AXUM_NEST_FN.search(ref.arg_preview)
+        if m:
+            prefixes[m.group(1)] = prefix
+    return prefixes
+
+
 def _axum_routes(x: FileExtraction) -> list[EntrypointHint]:
     """`Router::new().route("/x", post(handler))` — the handler is buried in the
     second argument, so we regex it out of the preview but can't statically bind
-    it (the Express-rule fidelity tradeoff)."""
+    it (the Express-rule fidelity tradeoff). Routes declared inside a function that
+    is `.nest("/prefix", fn())`-mounted are composed with that prefix."""
+    nest_prefixes = _axum_nest_prefixes(x)
     hints = []
     for ref in x.references:
         if ref.kind != "call" or ref.callee_name != "route" or not ref.arg_preview:
@@ -70,12 +97,15 @@ def _axum_routes(x: FileExtraction) -> list[EntrypointHint]:
         if route is None or not route.startswith("/"):
             continue
         method, handler = _axum_method_and_handler(ref.arg_preview)
+        # the enclosing router-builder function, if it's mounted under a nest prefix
+        builder = (ref.caller_qualified_name or "").rsplit(".", 1)[-1]
+        full = compose_route(nest_prefixes.get(builder, ""), route)
         hints.append(
             EntrypointHint(
                 rule_id="rust.axum.route",
                 kind=EntrypointKind.HTTP_ROUTE,
                 handler_qualified_name=None,
-                route=route,
+                route=full,
                 http_methods=[method],
                 framework="axum",
                 metadata={"handler_text": handler, "registration": ref.arg_preview},

entrygraph-0.1.46/tests/test_entrypoints_php.py

@@ -0,0 +1,66 @@
+"""PHP entrypoint-rule tests (kept per-language so PRs touching different
+languages don't serially conflict on one shared test module)."""
+
+from __future__ import annotations
+
+from entrygraph.detect.entrypoints import rules_for
+from entrygraph.detect.entrypoints.php import _symfony_methods, _symfony_path
+from entrygraph.extract.base import FileContext
+from entrygraph.extract.php import PhpExtractor
+from entrygraph.parsing.parsers import parse
+
+
+def _symfony_rule():
+    return {r.id: r for r in rules_for("php", {"symfony"})}["php.symfony.route"]
+
+
+def _extract(src: bytes, path="src/Controller/UserController.php"):
+    ctx = FileContext(
+        path=path,
+        language="php",
+        module_path="App.Controller.UserController",
+        source=src,
+        is_package=False,
+    )
+    return PhpExtractor().extract(parse("php", src), ctx)
+
+
+def test_symfony_class_route_prefix_composed():
+    # Class-level #[Route('/profile')] must prefix each method route, and
+    # methods: [...] must be honored (symfony-demo: 11/12 routes were wrong) (#36).
+    src = (
+        b"<?php\nnamespace App\\Controller;\n"
+        b"#[Route('/profile'), IsGranted(User::ROLE_USER)]\n"
+        b"final class UserController extends AbstractController\n{\n"
+        b"    #[Route('/edit', name: 'user_edit', methods: ['GET', 'POST'])]\n"
+        b"    public function edit() {}\n"
+        b"    #[Route(path: '/pw', name: 'pw')]\n"
+        b"    public function pw() {}\n"
+        b"}\n"
+    )
+    got = {(tuple(h.http_methods), h.route) for h in _symfony_rule().match(_extract(src))}
+    assert got == {
+        (("GET", "POST"), "/profile/edit"),
+        (("*",), "/profile/pw"),  # path: named arg, no methods -> all verbs
+    }
+
+
+def test_symfony_route_without_class_prefix():
+    # A controller with no class-level #[Route] leaves method routes unprefixed.
+    src = (
+        b"<?php\nnamespace App\\Controller;\n"
+        b"final class SecurityController extends AbstractController\n{\n"
+        b"    #[Route('/login', name: 'login')]\n"
+        b"    public function login() {}\n"
+        b"}\n"
+    )
+    got = {(tuple(h.http_methods), h.route) for h in _symfony_rule().match(_extract(src))}
+    assert got == {(("*",), "/login")}
+
+
+def test_symfony_path_and_methods_parsing():
+    assert _symfony_path("#[Route('/edit', name: 'x')]") == "/edit"
+    assert _symfony_path("#[Route(path: '/pw', name: 'x')]") == "/pw"
+    assert _symfony_methods("#[Route('/x', methods: ['GET', 'POST'])]") == ["GET", "POST"]
+    assert _symfony_methods("#[Route('/x', methods: 'DELETE')]") == ["DELETE"]
+    assert _symfony_methods("#[Route('/x', name: 'x')]") == []

entrygraph-0.1.46/tests/test_entrypoints_rust.py

@@ -0,0 +1,53 @@
+"""Rust entrypoint-rule tests (kept per-language so PRs touching different
+languages don't serially conflict on one shared test module)."""
+
+from __future__ import annotations
+
+from entrygraph.detect.entrypoints import rules_for
+from entrygraph.extract.base import FileContext
+from entrygraph.extract.rust import RustExtractor
+from entrygraph.parsing.parsers import parse
+
+
+def _axum_rule():
+    return {r.id: r for r in rules_for("rust", {"axum"})}["rust.axum.route"]
+
+
+def _extract(src: bytes, path="src/main.rs"):
+    ctx = FileContext(path=path, language="rust", module_path="main", source=src, is_package=False)
+    return RustExtractor().extract(parse("rust", src), ctx)
+
+
+def test_axum_nest_prefix_composed_for_function_router():
+    # `.nest("/admin", admin_routes())` prefixes the routes declared inside the
+    # admin_routes builder function; top-level routes stay unprefixed (#36).
+    src = (
+        b"fn admin_routes() -> Router {\n"
+        b"    Router::new()\n"
+        b'        .route("/keys", delete(delete_all_keys))\n'
+        b'        .route("/key/{key}", delete(remove_key))\n'
+        b"}\n"
+        b"async fn main() {\n"
+        b"    let app = Router::new()\n"
+        b'        .route("/keys", get(list_keys))\n'
+        b'        .nest("/admin", admin_routes());\n'
+        b"}\n"
+    )
+    got = {(h.http_methods[0], h.route) for h in _axum_rule().match(_extract(src))}
+    assert got == {
+        ("GET", "/keys"),  # top-level, no prefix
+        ("DELETE", "/admin/keys"),  # composed with the nest prefix
+        ("DELETE", "/admin/key/{key}"),
+    }
+
+
+def test_axum_routes_without_nest_are_unprefixed():
+    src = (
+        b"async fn main() {\n"
+        b"    let app = Router::new()\n"
+        b'        .route("/users", get(list_users))\n'
+        b'        .route("/users/{id}", get(get_user));\n'
+        b"}\n"
+    )
+    got = {(h.http_methods[0], h.route) for h in _axum_rule().match(_extract(src))}
+    assert got == {("GET", "/users"), ("GET", "/users/{id}")}