codmap 0.0.24__tar.gz → 0.0.26__tar.gz

{codmap-0.0.24/codmap.egg-info → codmap-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codmap
-Version: 0.0.24
+Version: 0.0.26
 Summary: Static analyzer that turns a package's source into a queryable code graph.
 Author-email: kogriv <kogriv@gmail.com>
 License-Expression: MIT
@@ -44,7 +44,7 @@ and a **SCIP index** for interop with Sourcegraph / Glean and other precise-code
 
 [![CI](https://github.com/kogriv/codemap/actions/workflows/ci.yml/badge.svg)](https://github.com/kogriv/codemap/actions/workflows/ci.yml)
 
-**Status:** 🟢 M0–M20 implemented + research track (R1/R2) — schema 0.13, **1128 tests with no failures on
+**Status:** 🟢 M0–M20 implemented + research track (R1/R2) — schema 0.13, **1136 tests with no failures on
 Python 3.11–3.14** ([in CI](docs/ci.md): the full suite including the dogfood pass, a determinism check, a
 wheel smoke test, and ctags/SCIP interop against the real CLIs), warm serve surface with 31 ops (28 exposed
 as MCP tools), and SCIP export. See **[DESIGN.md](DESIGN.md)** (product design &

{codmap-0.0.24 → codmap-0.0.26}/README.md

@@ -8,7 +8,7 @@ and a **SCIP index** for interop with Sourcegraph / Glean and other precise-code
 
 [![CI](https://github.com/kogriv/codemap/actions/workflows/ci.yml/badge.svg)](https://github.com/kogriv/codemap/actions/workflows/ci.yml)
 
-**Status:** 🟢 M0–M20 implemented + research track (R1/R2) — schema 0.13, **1128 tests with no failures on
+**Status:** 🟢 M0–M20 implemented + research track (R1/R2) — schema 0.13, **1136 tests with no failures on
 Python 3.11–3.14** ([in CI](docs/ci.md): the full suite including the dogfood pass, a determinism check, a
 wheel smoke test, and ctags/SCIP interop against the real CLIs), warm serve surface with 31 ops (28 exposed
 as MCP tools), and SCIP export. See **[DESIGN.md](DESIGN.md)** (product design &

{codmap-0.0.24 → codmap-0.0.26}/codemap/arch.py

@@ -101,9 +101,31 @@ def load_contract(root: str | Path = ".") -> ArchitectureContract:
     data, error = read_toml(path)
     if error:
         return ArchitectureContract(error=error, path=str(path))
+    near = _near_miss_tables(data)
+    if near:
+        return ArchitectureContract(error=near, path=str(path))
     return replace(parse_contract(data.get("architecture", {})), path=str(path))
 
 
+def _near_miss_tables(data: dict) -> str | None:
+    """R1-C76 (design ``contract_table_typo.md``): a table named like ``[architecture]`` but not it.
+
+    ``[architectur]`` used to read as "no contract", exit 0: R1-C69 closed the schema inside the
+    table, and the table name stayed the one typo that turned a gate green. Refused even beside a
+    real ``[architecture]`` (D2): its rules would never run. Other tables are not checked (D3).
+    """
+    import difflib
+
+    names = [k for k, v in data.items()
+             if k != "architecture" and isinstance(v, dict)
+             and difflib.SequenceMatcher(None, k.lower(), "architecture").ratio() >= 0.8]
+    if not names:
+        return None
+    listed = ", ".join(f"`[{k}]`" for k in names)
+    return (f"{listed} looks like a misspelling of `[architecture]`; codemap reads only "
+            "`[architecture]`, so its rules would never run")
+
+
 #: R1-C69: the closed schema of ``[architecture]``. A key outside it is an error, not a skip.
 _FLAGS = ("no_cycles", "no_lazy_cycles", "no_type_only_cycles", "exhaustive", "no_phantom_rules")
 _KNOWN_KEYS = ("layers", "independent", "forbidden") + _FLAGS

{codmap-0.0.24 → codmap-0.0.26}/codemap/extract/behavior.py

@@ -682,7 +682,11 @@ def _resolve(call, modpath, class_prefix, imports, modmembers, members, reexport
             tgt = imports[head]
             if not _is_internal(tgt, modpath):
                 return f"{tgt}.{'.'.join(parts)}", "external"
-            cur = tgt
+            # R1-C75 (design ``reexported_class_calls.md``): the head first. A class bound through
+            # a package re-export (`from pkg import Cls`) is no node under the package's name, so
+            # `Cls.method()` died on its first hop while `Cls()` resolved. Unchanged for a head that
+            # is a node or names no re-export.
+            cur = _follow_reexport(tgt, reexports or {}, nodes)
             for part in parts:
                 cur = _follow_reexport(f"{cur}.{part}", reexports or {}, nodes)
             if len(parts) == 1 or cur in nodes:

{codmap-0.0.24 → codmap-0.0.26/codmap.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codmap
-Version: 0.0.24
+Version: 0.0.26
 Summary: Static analyzer that turns a package's source into a queryable code graph.
 Author-email: kogriv <kogriv@gmail.com>
 License-Expression: MIT
@@ -44,7 +44,7 @@ and a **SCIP index** for interop with Sourcegraph / Glean and other precise-code
 
 [![CI](https://github.com/kogriv/codemap/actions/workflows/ci.yml/badge.svg)](https://github.com/kogriv/codemap/actions/workflows/ci.yml)
 
-**Status:** 🟢 M0–M20 implemented + research track (R1/R2) — schema 0.13, **1128 tests with no failures on
+**Status:** 🟢 M0–M20 implemented + research track (R1/R2) — schema 0.13, **1136 tests with no failures on
 Python 3.11–3.14** ([in CI](docs/ci.md): the full suite including the dogfood pass, a determinism check, a
 wheel smoke test, and ctags/SCIP interop against the real CLIs), warm serve surface with 31 ops (28 exposed
 as MCP tools), and SCIP export. See **[DESIGN.md](DESIGN.md)** (product design &

{codmap-0.0.24 → codmap-0.0.26}/codmap.egg-info/SOURCES.txt

@@ -146,6 +146,8 @@ tests/test_r1c71_attribute_chain_calls.py
 tests/test_r1c72_flat_inference_in_packages.py
 tests/test_r1c73_cli_version.py
 tests/test_r1c74_call_site_conservation.py
+tests/test_r1c75_reexported_class_calls.py
+tests/test_r1c76_contract_table_typo.py
 tests/test_r1c7_edge_vocab.py
 tests/test_r1c8_deadcode.py
 tests/test_r1c9_incremental.py

{codmap-0.0.24 → codmap-0.0.26}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 # version. README says this plainly, since `pip install codmap` / `import codemap` is a
 # seam a reader will otherwise hit by surprise.
 name = "codmap"
-version = "0.0.24"
+version = "0.0.26"
 description = "Static analyzer that turns a package's source into a queryable code graph."
 readme = "README.md"
 # M20/D1: measured, not assumed. Each release of the declared range runs the full suite in

codmap-0.0.26/tests/test_r1c75_reexported_class_calls.py

@@ -0,0 +1,58 @@
+"""R1-C75 — a call through a class name that came in by a package re-export.
+
+`from pkg.indicators import LibraryManager` + `LibraryManager.create_indicator()` was unresolved in the
+fast tier, while the same call after a direct import of the defining module resolved, and so did a bare
+`LibraryManager()` through the re-export. Design: docs/design/reexported_class_calls.md.
+"""
+from codemap.extract import extract
+
+FILES = {
+    "__init__.py": "",
+    "indicators/__init__.py": "from .library.manager import LibraryManager\n",
+    "indicators/library/__init__.py": "",
+    "indicators/library/manager.py": (
+        "class LibraryManager:\n"
+        "    @classmethod\n    def create_indicator(cls, name):\n        return name\n\n"
+        "    @staticmethod\n    def load_all():\n        return 1\n"),
+    "analysis/__init__.py": "",
+    "analysis/s/__init__.py": "",
+    "analysis/s/direct.py": (
+        "from ...indicators.library.manager import LibraryManager\n\n\n"
+        "def direct():\n    return LibraryManager.create_indicator('x')\n"),
+    "analysis/s/viare.py": (
+        "from ...indicators import LibraryManager\n\n\n"
+        "def via_reexport():\n    return LibraryManager.create_indicator('x'), LibraryManager.load_all()\n\n\n"
+        "def construct():\n    return LibraryManager()\n"),
+    "analysis/s/absre.py": (
+        "from rpkg.indicators import LibraryManager\n\n\n"
+        "def absolute_reexport():\n    return LibraryManager.create_indicator('x')\n"),
+}
+M = "rpkg.indicators.library.manager.LibraryManager"
+
+
+def _graph(tmp_path):
+    root = tmp_path / "rpkg"
+    for rel, body in FILES.items():
+        p = root / rel
+        p.parent.mkdir(parents=True, exist_ok=True)
+        p.write_text(body)
+    return extract(str(root))
+
+
+def _calls(g, src):
+    return sorted(e.target for e in g.edges if e.type == "calls" and e.source == src)
+
+
+def test_a_method_of_a_reexported_class_resolves(tmp_path):
+    g = _graph(tmp_path)
+    assert _calls(g, "rpkg.analysis.s.viare.via_reexport") == [f"{M}.create_indicator", f"{M}.load_all"]
+    assert _calls(g, "rpkg.analysis.s.absre.absolute_reexport") == [f"{M}.create_indicator"]
+    for fn, n in (("viare.via_reexport", 2), ("absre.absolute_reexport", 1)):
+        c = g.nodes[f"rpkg.analysis.s.{fn}"].extras["calls"]
+        assert (c["resolved"], c["unresolved"]) == (n, 0)
+
+
+def test_the_direct_import_and_the_bare_constructor_are_unchanged(tmp_path):
+    g = _graph(tmp_path)
+    assert _calls(g, "rpkg.analysis.s.direct.direct") == [f"{M}.create_indicator"]
+    assert _calls(g, "rpkg.analysis.s.viare.construct") == [M]

codmap-0.0.26/tests/test_r1c76_contract_table_typo.py

@@ -0,0 +1,68 @@
+"""R1-C76 — a misspelled `[architecture]` table is refused, not read as "no contract".
+
+Found by asking codemap the question its import-linter card asked of import-linter (zero contracts pass).
+Design `docs/design/contract_table_typo.md`.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from codemap import arch
+from codemap.cli import main
+from codemap.extract import extract
+from codemap.query import Query
+from codemap.serve.check import build_check
+
+RULE = 'forbidden = [{from="core", to="analysis"}]\n'
+
+
+@pytest.fixture(scope="module")
+def pkg(tmp_path_factory):
+    root = tmp_path_factory.mktemp("r1c76") / "tpkg"
+    for d in (root, root / "core", root / "analysis"):
+        d.mkdir(parents=True, exist_ok=True)
+        (d / "__init__.py").write_text("")
+    (root / "analysis" / "b.py").write_text("X = 1\n")
+    (root / "core" / "a.py").write_text("from tpkg.analysis import b\n")
+    return root
+
+
+def _check(tmp_path, pkg, toml, capsys, *extra) -> tuple[int, str]:
+    if toml is not None:
+        (tmp_path / "codemap.toml").write_text(toml)
+    rc = main(["check", "--build", str(pkg), "--root", str(tmp_path), *extra])
+    return rc, capsys.readouterr().out
+
+
+@pytest.mark.parametrize("toml, name", [
+    (f"[architectur]\n{RULE}", "architectur"),
+    (f"[Architecture]\n{RULE}", "Architecture"),
+    (f"[archtecture]\n{RULE}", "archtecture"),
+    (f"[architecture]\nno_cycles = true\n\n[architectur]\n{RULE}", "architectur"),
+], ids=["A1", "A2-case", "A2-letter", "A3-both"])
+def test_a_near_miss_table_is_refused(tmp_path, pkg, capsys, toml, name):
+    rc, out = _check(tmp_path, pkg, toml, capsys)
+    assert rc == 2, out
+    assert f"`[{name}]`" in out and "`[architecture]`" in out
+
+
+def test_mcp_check_carries_the_refusal(tmp_path, pkg):
+    (tmp_path / "codemap.toml").write_text(f"[architectur]\n{RULE}")
+    c = arch.load_contract(tmp_path)
+    q = Query(extract(str(pkg)))
+    payload = build_check(q, c, arch.check_contract(q, c))
+    assert payload["ok"] is False
+    assert "`[architectur]`" in payload["contract_error"]
+
+
+def test_what_was_valid_or_absent_answers_as_before(tmp_path, pkg, capsys):
+    rc, out = _check(tmp_path, pkg, f"[architecture]\n{RULE}", capsys)
+    assert rc == 2 and "1 rule(s) broken" in out                      # a real violation, as before
+    rc, out = _check(tmp_path, pkg, '[integrations]\nenabled = []\n', capsys)
+    assert rc == 0 and "No `[architecture]` contract found" in out    # unrelated table: still absent
+    with pytest.raises(SystemExit, match="no \\[architecture\\] contract found"):
+        _check(tmp_path, pkg, None, capsys, "--require-contract")     # still opt-in for absence (exit 1)
+    (tmp_path / "codemap.toml").unlink()
+    rc, out = _check(tmp_path, pkg, None, capsys)
+    assert rc == 0 and "No `[architecture]` contract found" in out    # no file at all