sourcecode 1.58.0__py3-none-any.whl → 1.59.0__py3-none-any.whl

sourcecode/__init__.py

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

sourcecode/repository_ir.py

@@ -347,12 +347,17 @@ _SPRING_OTHER: frozenset[str] = frozenset({
     "@MatrixParam", "@CookieParam", "@Context",
 })
 
-_PUBLISH_EVENT_RE = re.compile(r'\.publishEvent\s*\(\s*new\s+(\w+)\s*[(\{]')
+# Optional generic type args between the event class name and its constructor
+# parens — diamond `<>` or explicit `<Order>` / `<Map<String,Integer>>`.
+# Required so `publishEvent(new SaveServiceEvent<>(obj))` (generic event wrappers,
+# e.g. OpenMRS *ServiceEvent family) is recognised as a publisher edge.
+_GENERIC_ARGS = r'(?:<[^<>;{}()]*(?:<[^<>;{}()]*>[^<>;{}()]*)*>)?'
+_PUBLISH_EVENT_RE = re.compile(r'\.publishEvent\s*\(\s*new\s+(\w+)\s*' + _GENERIC_ARGS + r'\s*[(\{]')
 
 # Two-step publish: SomeEvent var = new SomeEvent(...); publisher.publishEvent(var)
 # Used when event is created before passing to publishEvent (common pattern).
 _PUBLISH_EVENT_CALL_RE = re.compile(r'\.publishEvent\s*\(')
-_NEW_EVENT_INSTANTIATION_RE = re.compile(r'\bnew\s+(\w+Event)\s*[\({]')
+_NEW_EVENT_INSTANTIATION_RE = re.compile(r'\bnew\s+(\w+Event)\s*' + _GENERIC_ARGS + r'\s*[\({]')
 
 # Keycloak SPI event fire pattern: XxxEvent.fire(session, ...)
 _FIRE_EVENT_RE = re.compile(r'\b(\w+Event)\.fire\s*\(')
@@ -1122,6 +1127,102 @@ def _build_same_package_map(symbols: list[SymbolRecord]) -> dict[str, dict[str,
     return result
 
 
+# Reserved words that read like calls (`if (`, `for (`, …). Can never be sibling
+# method names (Java reserves them), but guard the intra-class scan anyway.
+_CALL_KEYWORDS: frozenset[str] = frozenset({
+    "if", "for", "while", "switch", "catch", "return", "synchronized",
+    "new", "super", "this", "assert",
+})
+
+
+def _method_body(raw_lines: list[str], start_idx: int) -> str:
+    """Source text of the method/constructor declared at raw_lines[start_idx],
+    from its first '{' to the matching '}' (brace-matched, string/char aware).
+
+    The signature prefix before '{' is dropped so the method's own name is not
+    scanned as a call site. Returns "" for a bodyless declaration (abstract /
+    interface method terminated by ';' before any '{').
+    """
+    depth = 0
+    started = False
+    out: list[str] = []
+    for i in range(start_idx, len(raw_lines)):
+        line = raw_lines[i]
+        if not started:
+            if "{" in line:
+                started = True
+                line = line[line.index("{"):]
+            elif ";" in line:
+                return ""           # bodyless declaration
+            else:
+                continue            # multi-line signature continuation
+        out.append(line)
+        depth += _count_net_braces(line)
+        if depth <= 0:
+            break
+    return "\n".join(out)
+
+
+def _intra_class_call_edges(symbols: list[SymbolRecord], source: str) -> list[RelationEdge]:
+    """Method-level `calls` edges for intra-class invocations.
+
+    `discontinueOrder(){ stopOrder(...); }` →
+    OrderServiceImpl#discontinueOrder --calls--> OrderServiceImpl#stopOrder.
+
+    Class-level call scans miss method-to-method calls within a single class, so
+    impact-chain on a private/helper method (e.g. OrderServiceImpl#stopOrder) found
+    zero method-level callers and degraded to a wrong class-level expansion. Resolves
+    bare `m(...)` and `this.m(...)` calls whose target is a sibling METHOD of the same
+    class. Overloads link to all same-name siblings (arity not resolved by regex).
+    Deterministic, in-source only — no cross-file or runtime inference.
+    """
+    callers = [s for s in symbols if s.symbol_kind in ("method", "constructor") and s.line]
+    if not callers:
+        return []
+
+    # Per-class sibling index: simple method name → [method FQNs]. Constructors are
+    # not call targets (a `new X(...)` site is a different relation).
+    siblings: dict[str, dict[str, list[str]]] = {}
+    for s in symbols:
+        if s.symbol_kind == "method" and "#" in s.symbol:
+            cls = _enclosing_class(s.symbol)
+            name = s.symbol.rsplit("#", 1)[1]
+            siblings.setdefault(cls, {}).setdefault(name, []).append(s.symbol)
+    if not siblings:
+        return []
+
+    raw_lines = source.splitlines()
+    edges: list[RelationEdge] = []
+    for caller in callers:
+        cls = _enclosing_class(caller.symbol)
+        sib = siblings.get(cls)
+        if not sib:
+            continue
+        body = _method_body(raw_lines, caller.line - 1)
+        if not body:
+            continue
+        body = _STRING_LITERAL_RE.sub('', _strip_java_comments(body))
+        for name, fqns in sib.items():
+            if name in _CALL_KEYWORDS:
+                continue
+            # bare `name(` (not preceded by word char or '.') OR explicit `this.name(`
+            pat = (r'(?<![\w.])' + re.escape(name) + r'\s*\('
+                   + r'|\bthis\s*\.\s*' + re.escape(name) + r'\s*\(')
+            if not re.search(pat, body):
+                continue
+            for tgt in fqns:
+                if tgt == caller.symbol:
+                    continue        # skip self-recursion self-loop
+                edges.append(RelationEdge(
+                    from_symbol=caller.symbol,
+                    to_symbol=tgt,
+                    type="calls",
+                    confidence="medium",
+                    evidence={"type": "method_call", "value": f"{name}(...)"},
+                ))
+    return edges
+
+
 def _build_relations(
     symbols: list[SymbolRecord],
     raw_imports: list[str],
@@ -1557,6 +1658,9 @@ def _build_relations(
                         evidence={"type": "method_call", "value": f"{_tgt.split('.')[-1]}.…(…)"},
                     ))
 
+    # ── Intra-class method calls: EnclosingMethod -> calls -> SameClass#sibling ──
+    edges.extend(_intra_class_call_edges(symbols, source))
+
     seen: set[tuple[str, str, str]] = set()
     unique: list[RelationEdge] = []
     for e in edges:

{sourcecode-1.58.0.dist-info → sourcecode-1.59.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sourcecode
-Version: 1.58.0
+Version: 1.59.0
 Summary: Persistent structural context and ultra-fast repeated analysis for AI coding agents
 License-File: LICENSE
 Keywords: agents,ai,codebase,context,developer-tools,llm
@@ -40,7 +40,7 @@ Description-Content-Type: text/markdown
 
 **Persistent structural context and ultra-fast repeated analysis for AI coding agents.**
 
-![Version](https://img.shields.io/badge/version-1.58.0-blue)
+![Version](https://img.shields.io/badge/version-1.59.0-blue)
 ![Python](https://img.shields.io/badge/python-3.9%2B-green)
 
 ---
@@ -114,7 +114,7 @@ pipx install sourcecode
 
 ```bash
 sourcecode version
-# sourcecode 1.58.0
+# sourcecode 1.59.0
 ```
 
 ---

{sourcecode-1.58.0.dist-info → sourcecode-1.59.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-sourcecode/__init__.py,sha256=zPgb29z23K85U3nCKBwXfaqA7j0bV7r7tMzxrVDP-9w,103
+sourcecode/__init__.py,sha256=2epIg2XeTy7k3HoxrmwEPHso7xkeVSRJ3jh1LHHjjkU,103
 sourcecode/adaptive_scanner.py,sha256=XffluXKzJUXrMtjEiAOnSNPZnztdIcts17T9ouHeID0,10521
 sourcecode/architecture_analyzer.py,sha256=liCwQmLgb5vplohy8arjYxs_HOIv5C9MjLh_gY6bc5Q,44115
 sourcecode/architecture_summary.py,sha256=z34_6v7cSwy98cof2UVciGho7SCrZ93tiqMmq5WNzRQ,20405
@@ -45,7 +45,7 @@ sourcecode/redactor.py,sha256=SB4hwIvg8h-hvcqKcDWaZvA-aSyn-at-BIRwa0tUv5E,3227
 sourcecode/relevance_scorer.py,sha256=0AgEt4KrV73nioMqBgjhGjtY7L2C7L7cSyKtj3IKcrw,9408
 sourcecode/rename_refactor.py,sha256=h6dNFlB9aZ_3q6heeHBkgXQeXaT03nvPSsYH6P8qxFg,12965
 sourcecode/repo_classifier.py,sha256=FG1vaWKdWXsWdl-S8hjVMiTqcwgaRXkDyvK4rPcOGtQ,22681
-sourcecode/repository_ir.py,sha256=n1H0OROkD1dHvpWAtDoYNHGlTkVhQpYIFqIQ3jf3mgs,214101
+sourcecode/repository_ir.py,sha256=YjpmR-Tdfnep1ryjfCQLjttLoKOcq0_11XbhuomDFX8,218657
 sourcecode/ris.py,sha256=RcqLVwC-doFcKKViYDkCjZLBqf_wzLES7-F6vHEeWzE,20419
 sourcecode/runtime_classifier.py,sha256=uTAD6BDCiBLUZEDRfqk718kM4RTT_vAbfkcOI2_Xx58,18432
 sourcecode/scanner.py,sha256=WdOQ78mMzjR1NjmKTlbxdgwinnCTfAhxCVLBEFQiFHU,8899
@@ -102,8 +102,8 @@ sourcecode/telemetry/consent.py,sha256=wLMvGNJeSSyZoNkQXpoUioY6mMv4Qdvuw7S9jAEWn
 sourcecode/telemetry/events.py,sha256=LtzYfaX9Ilckj5PTvAcTpDa9mLqDsYPDUiDkRa58piY,2580
 sourcecode/telemetry/filters.py,sha256=NHa5T-6DaZduQPFuC34jOqHWQgSizM-Ygq8aZ4j19ng,5834
 sourcecode/telemetry/transport.py,sha256=4gGHsq0WeY9VywEZXA3vUxykfiYnw9uuqfjAAec7F8o,1681
-sourcecode-1.58.0.dist-info/METADATA,sha256=hmIYx5s3UECwA6NNlKD6HEetY1pl-6t76_KF0YKZysA,38831
-sourcecode-1.58.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-sourcecode-1.58.0.dist-info/entry_points.txt,sha256=ex3F9rmbXeyDIoFQHtkEqTsKSaJow8F0LrVu8XfIktQ,57
-sourcecode-1.58.0.dist-info/licenses/LICENSE,sha256=7DdHrU9Z_3e7dSvq4ISijZNjnuHo5NIHNiHDouMQ9JU,10491
-sourcecode-1.58.0.dist-info/RECORD,,
+sourcecode-1.59.0.dist-info/METADATA,sha256=Tl_qHFWT-yXKwDto4VaZ_H9xnvBvabtL_oCosI4fn-0,38831
+sourcecode-1.59.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+sourcecode-1.59.0.dist-info/entry_points.txt,sha256=ex3F9rmbXeyDIoFQHtkEqTsKSaJow8F0LrVu8XfIktQ,57
+sourcecode-1.59.0.dist-info/licenses/LICENSE,sha256=7DdHrU9Z_3e7dSvq4ISijZNjnuHo5NIHNiHDouMQ9JU,10491
+sourcecode-1.59.0.dist-info/RECORD,,