sourcecode 1.31.2__tar.gz → 1.31.3__tar.gz

{sourcecode-1.31.2 → sourcecode-1.31.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sourcecode
-Version: 1.31.2
+Version: 1.31.3
 Summary: Deterministic codebase context for AI coding agents
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -225,7 +225,7 @@ Description-Content-Type: text/markdown
 
 **Deterministic, behavior-aware codebase context for AI agents and PR review.**
 
-![Version](https://img.shields.io/badge/version-1.31.2-blue)
+![Version](https://img.shields.io/badge/version-1.31.3-blue)
 ![Python](https://img.shields.io/badge/python-3.10%2B-green)
 
 ---
@@ -261,7 +261,7 @@ pipx install sourcecode
 
 ```bash
 sourcecode version
-# sourcecode 1.31.2
+# sourcecode 1.31.3
 ```
 
 ---

{sourcecode-1.31.2 → sourcecode-1.31.3}/README.md

@@ -2,7 +2,7 @@
 
 **Deterministic, behavior-aware codebase context for AI agents and PR review.**
 
-![Version](https://img.shields.io/badge/version-1.31.2-blue)
+![Version](https://img.shields.io/badge/version-1.31.3-blue)
 ![Python](https://img.shields.io/badge/python-3.10%2B-green)
 
 ---
@@ -38,7 +38,7 @@ pipx install sourcecode
 
 ```bash
 sourcecode version
-# sourcecode 1.31.2
+# sourcecode 1.31.3
 ```
 
 ---

{sourcecode-1.31.2 → sourcecode-1.31.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sourcecode"
-version = "1.31.2"
+version = "1.31.3"
 description = "Deterministic codebase context for AI coding agents"
 readme = "README.md"
 requires-python = ">=3.9"

{sourcecode-1.31.2 → sourcecode-1.31.3}/src/sourcecode/__init__.py

@@ -1,3 +1,3 @@
 """sourcecode — Deterministic codebase context maps for AI coding agents."""
 
-__version__ = "1.31.2"
+__version__ = "1.31.3"

{sourcecode-1.31.2 → sourcecode-1.31.3}/src/sourcecode/cli.py

@@ -2467,6 +2467,8 @@ def _extract_java_endpoints(root: "Path") -> "dict[str, Any]":
     _CLASS_PATH_RE = _re.compile(
         r'@RequestMapping\s*\(\s*(?:value\s*=\s*)?["\']([^"\']+)["\']',
     )
+    _REQUEST_METHOD_VERB_RE = _re.compile(r'method\s*=\s*RequestMethod\.([A-Z]+)')
+    _VALUE_PATH_RE = _re.compile(r'value\s*=\s*"([^"]+)"')
 
     _HTTP_METHOD_MAP = {
         "Get": "GET", "Post": "POST", "Put": "PUT",
@@ -2502,12 +2504,24 @@ def _extract_java_endpoints(root: "Path") -> "dict[str, Any]":
         cls_m = _CLASS_RE.search(content)
         class_name = cls_m.group(1) if cls_m else java_file.stem
 
-        # Extract class-level base path from @RequestMapping on the class
+        # Extract class-level base path and locate class body start
         class_base = ""
         lines = content.splitlines()
+
+        # First pass: find class/interface declaration line index
+        class_body_start = 0
         for i, line in enumerate(lines):
-            if "@RequestMapping" in line and i < len(lines) - 1:
-                # Check if next non-blank line is class declaration or it's on same block
+            stripped_l = line.strip()
+            if (not stripped_l.startswith("//") and not stripped_l.startswith("*")
+                    and ("class " in stripped_l or "interface " in stripped_l)
+                    and _CLASS_RE.search(stripped_l)):
+                class_body_start = i + 1
+                break
+
+        # Second pass: extract class-level @RequestMapping path (only before class body)
+        search_end = class_body_start if class_body_start else len(lines)
+        for i in range(search_end):
+            if "@RequestMapping" in lines[i]:
                 block = "\n".join(lines[max(0, i - 1): i + 5])
                 if "class " in block or "interface " in block:
                     path_m = _CLASS_PATH_RE.search(block)
@@ -2515,12 +2529,13 @@ def _extract_java_endpoints(root: "Path") -> "dict[str, Any]":
                         class_base = path_m.group(1).rstrip("/")
                     break
 
-        # Extract method-level endpoints
-        # Parse line-by-line to associate annotations with methods
+        # Extract method-level endpoints starting from inside class body
+        # (skipping class-level annotations that appear before the class declaration)
         pending_annotations: list[tuple[str, str]] = []  # (http_verb, path_suffix)
         pending_filtro: Optional[str] = None
 
-        for i, line in enumerate(lines):
+        for i in range(class_body_start, len(lines)):
+            line = lines[i]
             stripped = line.strip()
 
             # Check for @M3FiltroSeguridad
@@ -2535,6 +2550,19 @@ def _extract_java_endpoints(root: "Path") -> "dict[str, Any]":
                 verb_key = hm.group(1)
                 http_verb = _HTTP_METHOD_MAP.get(verb_key, "GET")
                 path_suffix = (hm.group(2) or "").strip()
+
+                # For @RequestMapping: resolve HTTP method from method= attribute
+                if verb_key == "Request":
+                    annotation_block = "\n".join(lines[i:min(i + 5, len(lines))])
+                    vm = _REQUEST_METHOD_VERB_RE.search(annotation_block)
+                    if vm:
+                        http_verb = vm.group(1)
+                    # If path not captured (method= precedes value=), try value= extraction
+                    if not path_suffix:
+                        vp = _VALUE_PATH_RE.search(annotation_block)
+                        if vp:
+                            path_suffix = vp.group(1)
+
                 pending_annotations.append((http_verb, path_suffix))
                 continue
 

sourcecode-1.31.3/tests/test_bug_fixes_v1312.py

@@ -0,0 +1,239 @@
+"""Tests for v1.31.2 bug fixes.
+
+  BUG #1  endpoints: class-level @RequestMapping leaked into method loop
+          → all methods showed class path only (or double prefix)
+  BUG #2  endpoints: @RequestMapping(method=RequestMethod.DELETE) resolved as GET
+"""
+from __future__ import annotations
+
+import json
+import textwrap
+from pathlib import Path
+
+import pytest
+from typer.testing import CliRunner
+
+from sourcecode.cli import app, _extract_java_endpoints
+
+runner = CliRunner()
+
+
+# ── helpers ───────────────────────────────────────────────────────────────────
+
+def _write_java(tmp_path: Path, filename: str, source: str) -> Path:
+    f = tmp_path / filename
+    f.write_text(textwrap.dedent(source), encoding="utf-8")
+    return tmp_path
+
+
+# ── BUG #1: path concatenation ─────────────────────────────────────────────
+
+
+def test_acceso_rol_paths_correct(tmp_path):
+    """AccesoRolRestController: each method gets class_base + method_path."""
+    _write_java(tmp_path, "AccesoRolRestController.java", """\
+        @RestController
+        @RequestMapping("/v1/accesoRol")
+        public class AccesoRolRestController {
+
+            @M3FiltroSeguridad("accesoRol")
+            @GetMapping("/list")
+            public ResponseEntity<?> list() { return null; }
+
+            @PostMapping("/create")
+            public ResponseEntity<?> create() { return null; }
+
+            @DeleteMapping("/{id}")
+            public ResponseEntity<?> delete() { return null; }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    paths = {e["path"] for e in result["endpoints"]}
+    assert "/v1/accesoRol/list" in paths, f"expected /v1/accesoRol/list, got {paths}"
+    assert "/v1/accesoRol/create" in paths
+    assert "/v1/accesoRol/{id}" in paths
+    # class path alone must NOT appear as a standalone endpoint
+    assert "/v1/accesoRol" not in paths
+    # no double-prefix
+    assert not any("/v1/accesoRol/v1/accesoRol" in p for p in paths)
+
+
+def test_no_double_prefix(tmp_path):
+    """Class path must not be concatenated with itself."""
+    _write_java(tmp_path, "PortalController.java", """\
+        @RestController
+        @RequestMapping("/v1/portal/acreditaciones")
+        public class PortalController {
+
+            @GetMapping("/all")
+            public List<?> getAll() { return null; }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    paths = {e["path"] for e in result["endpoints"]}
+    assert "/v1/portal/acreditaciones/all" in paths
+    assert not any("acreditaciones/v1" in p for p in paths)
+
+
+def test_method_count_one_per_handler(tmp_path):
+    """Each handler must produce exactly one endpoint, not two."""
+    _write_java(tmp_path, "FooController.java", """\
+        @RestController
+        @RequestMapping("/api")
+        public class FooController {
+
+            @GetMapping("/items")
+            public List<?> items() { return null; }
+
+            @PostMapping("/items")
+            public void save() { }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    assert result["total"] == 2
+    handlers = [e["handler"] for e in result["endpoints"]]
+    assert len(handlers) == len(set(handlers)), "duplicate handlers found"
+
+
+def test_no_class_level_path_in_method_loop(tmp_path):
+    """Class-level @RequestMapping must not pollute method loop."""
+    _write_java(tmp_path, "SimpleController.java", """\
+        @RestController
+        @RequestMapping(value = "/base")
+        public class SimpleController {
+
+            @GetMapping
+            public String root() { return "ok"; }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    # root() with @GetMapping (no path) → /base
+    assert result["total"] == 1
+    assert result["endpoints"][0]["path"] == "/base"
+    assert result["endpoints"][0]["handler"] == "root"
+
+
+# ── BUG #2: HTTP method resolution ────────────────────────────────────────────
+
+
+def test_request_mapping_delete_method(tmp_path):
+    """@RequestMapping(method=RequestMethod.DELETE) must resolve to DELETE."""
+    _write_java(tmp_path, "RolController.java", """\
+        @RestController
+        @RequestMapping("/v1/rol")
+        public class RolController {
+
+            @RequestMapping(value = "/borrarMultiple", method = RequestMethod.DELETE)
+            public ResponseEntity<?> borrarMultiple() { return null; }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    assert result["total"] == 1
+    ep = result["endpoints"][0]
+    assert ep["method"] == "DELETE", f"expected DELETE, got {ep['method']}"
+    assert ep["handler"] == "borrarMultiple"
+    assert ep["path"] == "/v1/rol/borrarMultiple"
+
+
+def test_request_mapping_post_method(tmp_path):
+    """@RequestMapping(method=RequestMethod.POST) must resolve to POST."""
+    _write_java(tmp_path, "ItemController.java", """\
+        @RestController
+        @RequestMapping("/items")
+        public class ItemController {
+
+            @RequestMapping(value = "/create", method = RequestMethod.POST)
+            public ResponseEntity<?> create() { return null; }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    ep = result["endpoints"][0]
+    assert ep["method"] == "POST"
+
+
+def test_request_mapping_no_method_defaults_get(tmp_path):
+    """@RequestMapping without method= defaults to GET."""
+    _write_java(tmp_path, "InfoController.java", """\
+        @RestController
+        public class InfoController {
+
+            @RequestMapping("/health")
+            public String health() { return "ok"; }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    assert result["endpoints"][0]["method"] == "GET"
+
+
+def test_request_mapping_method_before_value(tmp_path):
+    """@RequestMapping(method=DELETE, value="/path") — method= before value=."""
+    _write_java(tmp_path, "OrderController.java", """\
+        @RestController
+        @RequestMapping("/orders")
+        public class OrderController {
+
+            @RequestMapping(method = RequestMethod.DELETE, value = "/cancel")
+            public void cancel() { }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    ep = result["endpoints"][0]
+    assert ep["method"] == "DELETE"
+    assert ep["path"] == "/orders/cancel"
+
+
+def test_delete_mapping_annotation(tmp_path):
+    """@DeleteMapping must still resolve to DELETE (regression guard)."""
+    _write_java(tmp_path, "TaskController.java", """\
+        @RestController
+        @RequestMapping("/tasks")
+        public class TaskController {
+
+            @DeleteMapping("/{id}")
+            public void remove() { }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    assert result["endpoints"][0]["method"] == "DELETE"
+
+
+# ── combined: paths + methods ─────────────────────────────────────────────────
+
+
+def test_mixed_controller(tmp_path):
+    """Full CRUD controller: correct paths and methods for all verbs."""
+    _write_java(tmp_path, "CrudController.java", """\
+        @RestController
+        @RequestMapping("/v1/items")
+        public class CrudController {
+
+            @GetMapping
+            public List<?> getAll() { return null; }
+
+            @GetMapping("/{id}")
+            public Object getById() { return null; }
+
+            @PostMapping
+            public Object create() { return null; }
+
+            @PutMapping("/{id}")
+            public Object update() { return null; }
+
+            @DeleteMapping("/{id}")
+            public void delete() { }
+
+            @RequestMapping(value = "/bulk", method = RequestMethod.DELETE)
+            public void deleteBulk() { }
+        }
+    """)
+    result = _extract_java_endpoints(tmp_path)
+    by_handler = {e["handler"]: e for e in result["endpoints"]}
+
+    assert by_handler["getAll"]["method"] == "GET"
+    assert by_handler["getAll"]["path"] == "/v1/items"
+    assert by_handler["getById"]["path"] == "/v1/items/{id}"
+    assert by_handler["create"]["method"] == "POST"
+    assert by_handler["update"]["method"] == "PUT"
+    assert by_handler["delete"]["method"] == "DELETE"
+    assert by_handler["deleteBulk"]["method"] == "DELETE"
+    assert by_handler["deleteBulk"]["path"] == "/v1/items/bulk"