Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion graphify/extractors/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,19 @@

_WORKSPACE_PACKAGE_CACHE: dict[str, dict[str, Path]] = {}

_JS_CACHE_BYPASS_SUFFIXES = {".js", ".jsx", ".mjs", ".cjs", ".ts", ".tsx", ".mts", ".cts", ".vue", ".svelte"}
# The JS/TS language family — the file extensions the cross-file JS/TS symbol
# resolver operates over. This is a LANGUAGE-membership fact and the single
# source of truth for "is this a JS/TS-family file".
_JS_FAMILY_SUFFIXES = {".js", ".jsx", ".mjs", ".cjs", ".ts", ".tsx", ".mts", ".cts", ".vue", ".svelte"}

# Which files skip the AST cache. A CACHE POLICY, kept separate from
# _JS_FAMILY_SUFFIXES on purpose (#3326): the two happen to coincide today, but
# they answer different questions — one "is this JS/TS?", the other "should this
# skip caching?". Binding both to one set meant a change made for caching
# reasons silently changed which files produced INFERRED resolution edges, with
# nothing at either call site to reveal it. Copy, not alias, so the two can move
# independently.
_JS_CACHE_BYPASS_SUFFIXES = set(_JS_FAMILY_SUFFIXES)

@dataclass
class LanguageConfig:
Expand Down
4 changes: 2 additions & 2 deletions graphify/extractors/resolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from typing import Any, Callable
from pathlib import Path
from graphify.extractors.models import LanguageConfig, _JS_CACHE_BYPASS_SUFFIXES, _NamespaceExportFact, _StarExportFact, _SymbolAliasFact, _SymbolDeclarationFact, _SymbolExportFact, _SymbolImportFact, _SymbolResolutionFacts, _SymbolUseFact, _WORKSPACE_PACKAGE_CACHE # noqa: E402,F401
from graphify.extractors.models import LanguageConfig, _JS_FAMILY_SUFFIXES, _NamespaceExportFact, _StarExportFact, _SymbolAliasFact, _SymbolDeclarationFact, _SymbolExportFact, _SymbolImportFact, _SymbolResolutionFacts, _SymbolUseFact, _WORKSPACE_PACKAGE_CACHE # noqa: E402,F401
from graphify.extractors.base import ( # noqa: F401
_LANGUAGE_BUILTIN_GLOBALS,
_file_stem,
Expand Down Expand Up @@ -1891,7 +1891,7 @@ def _ts_walk_class_members(class_node, source: bytes, path: Path, class_nid: str
def _collect_js_symbol_resolution_facts(paths: list[Path], facts: _SymbolResolutionFacts) -> None:

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Health regression_collect_js_symbol_resolution_facts()

fans out to 26 callees (efferent coupling).

Grounded coupling-delta finding (deterministic), not an LLM guess.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Health regression_collect_js_symbol_resolution_facts()

fans out to 26 callees (efferent coupling).

Grounded coupling-delta finding (deterministic), not an LLM guess.

js_paths = [
path for path in paths
if path.suffix in _JS_CACHE_BYPASS_SUFFIXES
if path.suffix in _JS_FAMILY_SUFFIXES
]
if not js_paths:
return
Expand Down
65 changes: 65 additions & 0 deletions tests/test_js_family_cache_decoupled.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
"""The JS/TS language family is decoupled from the AST-cache bypass set (#3326).

`_collect_js_symbol_resolution_facts` used to pick which files go through JS/TS
cross-file resolution by testing membership in `_JS_CACHE_BYPASS_SUFFIXES` — a
cache-policy constant. So a change made for caching reasons silently changed
which files produced INFERRED edges, invisible from either call site. The
resolution filter now keys on `_JS_FAMILY_SUFFIXES` (a language-membership
fact); the two are independent objects.
"""

import graphify.extractors.models as models
import graphify.extractors.resolution as resolution
from graphify.extract import extract


def test_family_and_cache_bypass_are_distinct_objects():
fam = models._JS_FAMILY_SUFFIXES
cache = models._JS_CACHE_BYPASS_SUFFIXES
assert fam is not cache, "the two sets must be independent, not the same object"
# They coincide in value today, but mutating one must not touch the other.
probe = ".decoupling-probe"
cache_copy = set(cache)
try:
cache.add(probe)
assert probe not in fam, "mutating the cache set leaked into the family set"
finally:
cache.clear()
cache.update(cache_copy)


def test_resolution_filter_uses_the_family_constant():
# Read the source, not __code__.co_names: the constant is referenced inside
# a list comprehension, whose names live in a separate code object on Python
# 3.10/3.11 (they were only inlined into the enclosing function in 3.12,
# PEP 709) — so a co_names check is Python-version-dependent. The source is
# not.
import inspect

src = inspect.getsource(resolution._collect_js_symbol_resolution_facts)
assert "_JS_FAMILY_SUFFIXES" in src, (
"JS symbol resolution must select files by the language family"
)
assert "_JS_CACHE_BYPASS_SUFFIXES" not in src, (
"resolution must not gate on the cache-bypass policy constant"
)


def test_ts_cross_file_resolution_still_works(tmp_path, monkeypatch):
"""Behavior is unchanged: a .ts import call still resolves cross-file."""
monkeypatch.chdir(tmp_path)
(tmp_path / "m.ts").write_text(
"export function foo() { return 1; }\n", encoding="utf-8")
(tmp_path / "u.ts").write_text(
"import { foo } from './m';\nexport function use() { return foo(); }\n",
encoding="utf-8")
r = extract(sorted(tmp_path.glob("*.ts")), cache_root=tmp_path)
labels = {n["id"]: n.get("label", "") for n in r["nodes"]}
calls = {(labels.get(e["source"], ""), labels.get(e["target"], ""))
for e in r["edges"] if e["relation"] == "calls"}
assert any("use" in s.lower() and t.rstrip("()") == "foo" for s, t in calls), calls


def test_family_contains_the_js_ts_suffixes():
for suffix in (".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs", ".vue", ".svelte"):
assert suffix in models._JS_FAMILY_SUFFIXES
Loading