graphlens-typescript 0.2.2__tar.gz → 0.3.0__tar.gz

{graphlens_typescript-0.2.2 → graphlens_typescript-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: graphlens-typescript
-Version: 0.2.2
+Version: 0.3.0
 Summary: TypeScript language adapter for graphlens
 Requires-Dist: graphlens
 Requires-Dist: tree-sitter>=0.24

{graphlens_typescript-0.2.2 → graphlens_typescript-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "graphlens-typescript"
-version = "0.2.2"
+version = "0.3.0"
 description = "TypeScript language adapter for graphlens"
 requires-python = ">=3.13"
 dependencies = [

{graphlens_typescript-0.2.2 → graphlens_typescript-0.3.0}/src/graphlens_typescript/_adapter.py

@@ -14,6 +14,7 @@ from graphlens import (
     RelationKind,
 )
 from graphlens.utils import make_node_id
+from graphlens.utils.roots import filter_nested_root_files
 
 from graphlens_typescript._deps import (
     TYPESCRIPT_DEFAULT_DEP_PARSERS,
@@ -109,8 +110,14 @@ class TypescriptAdapter(LanguageAdapter):
                 self._dep_parsers,
             )
         else:
-            for lang_root in find_typescript_roots(project_root):
+            lang_roots = find_typescript_roots(project_root)
+            for lang_root in lang_roots:
                 root_files = self.collect_files(lang_root)
+                root_files = filter_nested_root_files(
+                    root_files,
+                    lang_root,
+                    lang_roots,
+                )
                 _analyze_root(
                     graph,
                     project_root,

{graphlens_typescript-0.2.2 → graphlens_typescript-0.3.0}/src/graphlens_typescript/_project_detector.py

@@ -6,6 +6,8 @@ import json
 import re
 from typing import TYPE_CHECKING
 
+from graphlens.utils import collect_marker_roots
+
 if TYPE_CHECKING:
     from pathlib import Path
 
@@ -42,26 +44,30 @@ def find_typescript_roots(search_root: Path) -> list[Path]:
     """
     Find TypeScript project roots within search_root (monorepo support).
 
-    Returns [search_root] if search_root itself has markers.
-    Otherwise walks subdirectories for marker files and returns distinct roots.
-    Falls back to [search_root] if nothing found.
+    A marker at ``search_root`` does not hide nested package roots.
+    ``tsconfig`` files inside an existing ``package.json`` root are treated as
+    that package's config rather than as independent roots.
     """
-    if _has_typescript_markers(search_root):
-        return [search_root]
-
-    roots: list[Path] = []
-    for marker in TYPESCRIPT_MARKERS:
-        for marker_file in sorted(search_root.rglob(marker)):
-            rel_parts = marker_file.relative_to(search_root).parts
-            if _EXCLUDED_DIRS & set(rel_parts):
-                continue
-            candidate = marker_file.parent
-            if any(
-                candidate == r or candidate.is_relative_to(r)
-                for r in roots
-            ):
-                continue
-            roots.append(candidate)
+    package_roots = collect_marker_roots(
+        search_root,
+        ("package.json",),
+        excluded_dirs=_EXCLUDED_DIRS,
+        fallback_to_search_root=False,
+    )
+    tsconfig_roots = collect_marker_roots(
+        search_root,
+        ("tsconfig.json",),
+        excluded_dirs=_EXCLUDED_DIRS,
+        fallback_to_search_root=False,
+    )
+
+    roots = list(package_roots)
+    for tsconfig_root in tsconfig_roots:
+        if tsconfig_root in roots:
+            continue
+        if any(tsconfig_root.is_relative_to(root) for root in package_roots):
+            continue
+        roots.append(tsconfig_root)
 
     return sorted(roots) if roots else [search_root]