entrygraph 0.1.36__tar.gz → 0.1.37__tar.gz

{entrygraph-0.1.36 → entrygraph-0.1.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entrygraph
-Version: 0.1.36
+Version: 0.1.37
 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.36 → entrygraph-0.1.37}/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.36'
-__version_tuple__ = version_tuple = (0, 1, 36)
+__version__ = version = '0.1.37'
+__version_tuple__ = version_tuple = (0, 1, 37)
 
 __commit_id__ = commit_id = None

{entrygraph-0.1.36 → entrygraph-0.1.37}/src/entrygraph/detect/entrypoints/golang.py

@@ -3,6 +3,8 @@ registration, gin router routes, and cobra CLI commands."""
 
 from __future__ import annotations
 
+import re
+
 from entrygraph.detect.entrypoints.base import (
     EntrypointRule,
     first_string_arg,
@@ -114,30 +116,51 @@ def _gin_style(framework: str):
     return matcher
 
 
+_QUOTED = re.compile(r'"([^"]+)"')
+
+
 def _gorilla_routes(x: FileExtraction) -> list[EntrypointHint]:
-    """gorilla/mux: r.HandleFunc('/x', handler)."""
-    hints = []
+    """gorilla/mux, including the chained builder forms.
+
+    A registration is a method chain on one statement:
+        r.HandleFunc("/x", h).Methods("GET")
+        r.Path("/x").Methods("GET", "POST").HandlerFunc(h)
+    so the route (Path/HandleFunc), verb(s) (Methods) and handler are aggregated
+    per line. Previously only bare HandleFunc was matched — the `.Path().Methods()`
+    form and any `.Methods()` verb were dropped (loki: ~0% of gorilla routes).
+    """
+    routes: dict[int, str] = {}
+    methods: dict[int, list[str]] = {}
+    handlers: dict[int, str | None] = {}
     for ref in x.references:
-        if (
-            ref.kind == "call"
-            and ref.callee_name in ("HandleFunc", "Handle")
-            and ref.receiver_text not in (None, "http")
-            and ref.arg_preview
-        ):
+        if ref.kind != "call" or not ref.arg_preview:
+            continue
+        line = ref.span.start_line
+        # a route is opened by HandleFunc("/x", h) or Path("/x") on the router;
+        # exclude net/http's own http.HandleFunc.
+        defines_route = (
+            ref.callee_name in ("HandleFunc", "Handle") and ref.receiver_text not in (None, "http")
+        ) or (ref.callee_name == "Path" and ref.receiver_text is not None)
+        if defines_route:
             route = first_string_arg("(" + ref.arg_preview.lstrip("("))
             if route is not None and route.startswith("/"):
-                hints.append(
-                    EntrypointHint(
-                        rule_id="go.gorilla-mux.route",
-                        kind=EntrypointKind.HTTP_ROUTE,
-                        handler_qualified_name=ref.caller_qualified_name,
-                        route=route,
-                        http_methods=["*"],
-                        framework="gorilla-mux",
-                        metadata={"registration": ref.arg_preview},
-                    )
-                )
-    return hints
+                routes.setdefault(line, route)
+                handlers.setdefault(line, ref.caller_qualified_name)
+        elif ref.callee_name == "Methods":
+            verbs = [v.upper() for v in _QUOTED.findall(ref.arg_preview)]
+            if verbs:
+                methods.setdefault(line, []).extend(verbs)
+    return [
+        EntrypointHint(
+            rule_id="go.gorilla-mux.route",
+            kind=EntrypointKind.HTTP_ROUTE,
+            handler_qualified_name=handlers.get(line),
+            route=route,
+            http_methods=methods.get(line, ["*"]),
+            framework="gorilla-mux",
+        )
+        for line, route in routes.items()
+    ]
 
 
 def _cobra_commands(x: FileExtraction) -> list[EntrypointHint]:

{entrygraph-0.1.36 → entrygraph-0.1.37}/tests/test_entrypoint_expansion.py

@@ -488,3 +488,35 @@ def test_laravel_apiresource_rule_emits_rest_routes():
     got = {(h.http_methods[0], h.route) for h in rule.match(x)}
     assert ("GET", "/articles") in got and ("DELETE", "/articles/{article}") in got
     assert ("GET", "/articles/create") not in got  # apiResource omits forms
+
+
+def _go_call_ref(callee, receiver, arg, line=1):
+    return RawReference(
+        kind="call",
+        callee_text=f"{receiver}.{callee}",
+        callee_name=callee,
+        receiver_text=receiver,
+        span=Span(line, 0, line, 40),
+        caller_qualified_name="app.setup",
+        arg_preview=arg,
+    )
+
+
+def test_gorilla_chained_routes_and_methods():
+    # gorilla registrations are method chains on one statement; the route (Path/
+    # HandleFunc) and verb(s) (Methods) must be aggregated per line (#37).
+    from entrygraph.detect.entrypoints import rules_for
+
+    refs = [
+        # r.HandleFunc("/users", h).Methods("GET")   (line 1)
+        _go_call_ref("HandleFunc", "r", '("/users", listUsers)', line=1),
+        _go_call_ref("Methods", 'r.HandleFunc("/users", listUsers)', '("GET")', line=1),
+        # r.Path("/reports").Methods("POST", "PUT").Handler(h)   (line 2)
+        _go_call_ref("Path", "r", '("/reports")', line=2),
+        _go_call_ref("Methods", 'r.Path("/reports")', '("POST", "PUT")', line=2),
+        _go_call_ref("Handler", 'r.Path("/reports").Methods("POST", "PUT")', "(h)", line=2),
+    ]
+    rule = {r.id: r for r in rules_for("go", {"gorilla-mux"})}["go.gorilla-mux.route"]
+    got = {(tuple(h.http_methods), h.route) for h in rule.match(_go_ext(refs))}
+    assert (("GET",), "/users") in got  # HandleFunc route + chained method
+    assert (("POST", "PUT"), "/reports") in got  # Path().Methods().Handler() form