cg-code-graph 0.14.0__tar.gz → 0.15.0__tar.gz

{cg_code_graph-0.14.0/cg_code_graph.egg-info → cg_code_graph-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cg-code-graph
-Version: 0.14.0
+Version: 0.15.0
 Summary: cg: a code graph of routes, calls, data access and platform boundaries for agents and humans (CLI + MCP server)
 Author: cyberchronos00
 License-Expression: MIT
@@ -72,7 +72,7 @@ dependents: 18 nodes  (code: 6, entry points: 9, other: 3)
 | Language | Frameworks and facts | Calls | Docs |
 |---|---|---|---|
 | ![Python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white) | Django (+ DRF, django-ninja), FastAPI / Starlette, Flask, Celery | exact (stdlib `ast`) | [Python](https://code-graph.cyberchronos00.workers.dev/docs/python) |
-| ![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white) ![JavaScript](https://img.shields.io/badge/JavaScript-F7DF1E?logo=javascript&logoColor=black) | Nuxt / Vue, NestJS, Next.js, Express, Fastify, Koa, Hono | exact (TypeScript compiler API) | [TS frameworks](https://code-graph.cyberchronos00.workers.dev/docs/ts-frameworks) |
+| ![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white) ![JavaScript](https://img.shields.io/badge/JavaScript-F7DF1E?logo=javascript&logoColor=black) | Nuxt / Vue, NestJS, Next.js, Astro, Express, Fastify, Koa, Hono | exact (TypeScript compiler API) | [TS frameworks](https://code-graph.cyberchronos00.workers.dev/docs/ts-frameworks) |
 | ![PHP](https://img.shields.io/badge/PHP-777BB4?logo=php&logoColor=white) | Laravel (routes and middleware, queues, broadcasting) | exact (nikic/php-parser; needs PHP 8.2+) | [PHP](https://code-graph.cyberchronos00.workers.dev/docs/php) |
 | ![Dart](https://img.shields.io/badge/Dart-0175C2?logo=dart&logoColor=white) | Flutter | exact (Dart analyzer; needs the Dart SDK) | [Platforms](https://code-graph.cyberchronos00.workers.dev/docs/platforms) |
 | ![Kotlin](https://img.shields.io/badge/Kotlin-7F52FF?logo=kotlin&logoColor=white) | Android, Kotlin Multiplatform | heuristic; exact with scip-java (opt-in) | [Kotlin](https://code-graph.cyberchronos00.workers.dev/docs/kotlin) |

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/README.md

@@ -46,7 +46,7 @@ dependents: 18 nodes  (code: 6, entry points: 9, other: 3)
 | Language | Frameworks and facts | Calls | Docs |
 |---|---|---|---|
 | ![Python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white) | Django (+ DRF, django-ninja), FastAPI / Starlette, Flask, Celery | exact (stdlib `ast`) | [Python](https://code-graph.cyberchronos00.workers.dev/docs/python) |
-| ![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white) ![JavaScript](https://img.shields.io/badge/JavaScript-F7DF1E?logo=javascript&logoColor=black) | Nuxt / Vue, NestJS, Next.js, Express, Fastify, Koa, Hono | exact (TypeScript compiler API) | [TS frameworks](https://code-graph.cyberchronos00.workers.dev/docs/ts-frameworks) |
+| ![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white) ![JavaScript](https://img.shields.io/badge/JavaScript-F7DF1E?logo=javascript&logoColor=black) | Nuxt / Vue, NestJS, Next.js, Astro, Express, Fastify, Koa, Hono | exact (TypeScript compiler API) | [TS frameworks](https://code-graph.cyberchronos00.workers.dev/docs/ts-frameworks) |
 | ![PHP](https://img.shields.io/badge/PHP-777BB4?logo=php&logoColor=white) | Laravel (routes and middleware, queues, broadcasting) | exact (nikic/php-parser; needs PHP 8.2+) | [PHP](https://code-graph.cyberchronos00.workers.dev/docs/php) |
 | ![Dart](https://img.shields.io/badge/Dart-0175C2?logo=dart&logoColor=white) | Flutter | exact (Dart analyzer; needs the Dart SDK) | [Platforms](https://code-graph.cyberchronos00.workers.dev/docs/platforms) |
 | ![Kotlin](https://img.shields.io/badge/Kotlin-7F52FF?logo=kotlin&logoColor=white) | Android, Kotlin Multiplatform | heuristic; exact with scip-java (opt-in) | [Kotlin](https://code-graph.cyberchronos00.workers.dev/docs/kotlin) |

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0/cg_code_graph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cg-code-graph
-Version: 0.14.0
+Version: 0.15.0
 Summary: cg: a code graph of routes, calls, data access and platform boundaries for agents and humans (CLI + MCP server)
 Author: cyberchronos00
 License-Expression: MIT
@@ -72,7 +72,7 @@ dependents: 18 nodes  (code: 6, entry points: 9, other: 3)
 | Language | Frameworks and facts | Calls | Docs |
 |---|---|---|---|
 | ![Python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white) | Django (+ DRF, django-ninja), FastAPI / Starlette, Flask, Celery | exact (stdlib `ast`) | [Python](https://code-graph.cyberchronos00.workers.dev/docs/python) |
-| ![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white) ![JavaScript](https://img.shields.io/badge/JavaScript-F7DF1E?logo=javascript&logoColor=black) | Nuxt / Vue, NestJS, Next.js, Express, Fastify, Koa, Hono | exact (TypeScript compiler API) | [TS frameworks](https://code-graph.cyberchronos00.workers.dev/docs/ts-frameworks) |
+| ![TypeScript](https://img.shields.io/badge/TypeScript-3178C6?logo=typescript&logoColor=white) ![JavaScript](https://img.shields.io/badge/JavaScript-F7DF1E?logo=javascript&logoColor=black) | Nuxt / Vue, NestJS, Next.js, Astro, Express, Fastify, Koa, Hono | exact (TypeScript compiler API) | [TS frameworks](https://code-graph.cyberchronos00.workers.dev/docs/ts-frameworks) |
 | ![PHP](https://img.shields.io/badge/PHP-777BB4?logo=php&logoColor=white) | Laravel (routes and middleware, queues, broadcasting) | exact (nikic/php-parser; needs PHP 8.2+) | [PHP](https://code-graph.cyberchronos00.workers.dev/docs/php) |
 | ![Dart](https://img.shields.io/badge/Dart-0175C2?logo=dart&logoColor=white) | Flutter | exact (Dart analyzer; needs the Dart SDK) | [Platforms](https://code-graph.cyberchronos00.workers.dev/docs/platforms) |
 | ![Kotlin](https://img.shields.io/badge/Kotlin-7F52FF?logo=kotlin&logoColor=white) | Android, Kotlin Multiplatform | heuristic; exact with scip-java (opt-in) | [Kotlin](https://code-graph.cyberchronos00.workers.dev/docs/kotlin) |

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/cg_code_graph.egg-info/SOURCES.txt

@@ -71,6 +71,8 @@ codegraph/core/plugin.py
 codegraph/core/store.py
 codegraph/core/syntax_errors.py
 codegraph/plugins/__init__.py
+codegraph/plugins/astro/__init__.py
+codegraph/plugins/astro/plugin.py
 codegraph/plugins/cfamily/__init__.py
 codegraph/plugins/cfamily/plugin.py
 codegraph/plugins/cfamily/syntax.py
@@ -206,6 +208,7 @@ tests/test_agents_md.py
 tests/test_ai_tools.py
 tests/test_android_ipc.py
 tests/test_apple_ipc.py
+tests/test_astro.py
 tests/test_bridges.py
 tests/test_bridges_pigeon_monorepo.py
 tests/test_brokers.py
@@ -233,6 +236,7 @@ tests/test_index_isolation.py
 tests/test_inherited_overrides.py
 tests/test_jobs.py
 tests/test_js_refs.py
+tests/test_js_runtime.py
 tests/test_kotlin.py
 tests/test_kotlin_binding.py
 tests/test_kotlin_exact.py

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/codegraph/__init__.py

@@ -1,2 +1,2 @@
 """code-graph: deterministic code knowledge graph (beta)."""
-__version__ = "0.14.0"
+__version__ = "0.15.0"

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/codegraph/config.py

@@ -61,7 +61,7 @@ KNOWN_KEYS = set(SCHEMA)
 PYTHON_KEYS = SCHEMA["python"]
 VIZ_MODES = ("reaches", "impact", "downstream", "path", "plan")
 # framework plugins of codegraph/indexer.py FRAMEWORK_PLUGINS (frameworks.add / remove also take preset names)
-FRAMEWORK_PLUGIN_NAMES = ("laravel", "nuxt", "django", "fastapi", "flask", "flutter", "nest", "nextjs", "express")
+FRAMEWORK_PLUGIN_NAMES = ("laravel", "nuxt", "django", "fastapi", "flask", "flutter", "nest", "nextjs", "express", "astro")
 
 
 class ConfigError(ValueError):

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/codegraph/core/detect.py

@@ -51,6 +51,9 @@ def detect(root: Path) -> dict:
     deps = _pkg_deps(root)
     if "nuxt" in deps or any((root / n).exists() for n in ("nuxt.config.ts", "nuxt.config.js")):
         fw["nuxt"] = {"version": deps.get("nuxt")}
+    if "astro" in deps or any((root / n).exists() for n in (
+            "astro.config.mjs", "astro.config.js", "astro.config.ts", "astro.config.mts", "astro.config.cjs")):
+        fw["astro"] = {"version": deps.get("astro")}
     if "vue" in deps:
         fw["vue"] = {"version": deps.get("vue")}
     from ..plugins.tsweb.common import SERVER_DEPS   # TS / JS servers (NestJS, Next.js, Express / Koa / Fastify / Hono ...)

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/codegraph/core/extractors.py

@@ -103,10 +103,64 @@ def status(lang: str) -> dict:
     return {"installed": _installed(d, spec), "dir": str(d), "where": "cache"}
 
 
+JS_RUNTIME_MISSING = (
+    "node not installed (the TypeScript extractor needs Node.js 20+ or Bun on PATH, "
+    "or CODEGRAPH_NODE=/path/to/node)"
+)
+
+
+def _runtime_kind(path: str) -> str:
+    """`bun` when the binary (or what a `node` symlink points at, as in Bun images) is Bun, else `node`."""
+    names = (Path(path).name, Path(os.path.realpath(path)).name)
+    return "bun" if any(n.lower().startswith("bun") for n in names) else "node"
+
+
+def _override() -> str | None:
+    v = (os.environ.get("CODEGRAPH_NODE") or "").strip()
+    return os.path.expanduser(v) if v else None
+
+
+def js_runtime() -> dict | None:
+    """Node.js or Bun for the TypeScript extractor.
+
+    ``CODEGRAPH_NODE`` (a name on PATH or a path) wins, then ``node`` on PATH, then ``bun``.
+    """
+    override = _override()
+    if override:
+        path = shutil.which(override)
+        if not path:
+            return None
+        return {"path": path, "kind": _runtime_kind(path), "source": "CODEGRAPH_NODE"}
+    node = shutil.which("node")
+    if node:
+        return {"path": node, "kind": _runtime_kind(node), "source": "PATH"}
+    bun = shutil.which("bun")
+    if bun:
+        return {"path": bun, "kind": "bun", "source": "PATH"}
+    return None
+
+
+def js_runtime_problem() -> str | None:
+    """Why the TypeScript extractor cannot start, or None when a runtime resolves."""
+    override = _override()
+    if override and not shutil.which(override):
+        return (f"CODEGRAPH_NODE={os.environ.get('CODEGRAPH_NODE')} is not an executable on PATH or a path to one "
+                "(set it to a node or bun binary, or unset it to use node / bun from PATH)")
+    if js_runtime() is None:
+        return JS_RUNTIME_MISSING
+    return None
+
+
 def install_command(lang: str, dart: str | None = None) -> list[str]:
     if lang == "typescript":
-        npm = shutil.which("npm") or "npm"
-        return [npm, "ci", "--no-audit", "--no-fund", "--loglevel=error"]
+        npm = shutil.which("npm")
+        if npm:
+            return [npm, "ci", "--no-audit", "--no-fund", "--loglevel=error"]
+        rt = js_runtime()
+        bun = rt["path"] if rt and rt["kind"] == "bun" else shutil.which("bun")
+        if bun:
+            return [bun, "install", "--frozen-lockfile", "--no-progress"]
+        return ["npm", "ci", "--no-audit", "--no-fund", "--loglevel=error"]
     if lang == "php":
         return [shutil.which("composer") or "composer", "install", "--no-dev", "--no-interaction", "--no-progress", "--quiet"]
     return [dart or shutil.which("dart") or "dart", "pub", "get"]
@@ -180,7 +234,8 @@ def prune(dry_run: bool = False) -> list[tuple[Path, int]]:
 
 def _run(cmd: list[str], d: Path, spec: Spec) -> None:
     if not shutil.which(cmd[0]) and not Path(cmd[0]).exists():
-        raise RuntimeError(f"{spec.label} extractor dependencies missing and `{spec.tool}` is not installed")
+        tool = "`npm` (or `bun`)" if spec.tool == "npm" else f"`{spec.tool}`"
+        raise RuntimeError(f"{spec.label} extractor dependencies missing and {tool} is not installed")
     r = subprocess.run(cmd, cwd=d, capture_output=True, text=True)
     if r.returncode != 0:
         raise RuntimeError(f"{spec.label} extractor dependency install failed ({' '.join(cmd[:2])} in {d}): "

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/codegraph/coverage.py

@@ -16,7 +16,7 @@ from pathlib import Path
 # source extensions per language plugin (key = plugin name in stats["plugins"])
 SUPPORTED = {
     "php": (".php",),
-    "typescript": (".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs", ".vue"),
+    "typescript": (".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs", ".vue", ".astro"),
     "python": (".py",),
     "dart": (".dart",),
     "rust": (".rs",),
@@ -33,7 +33,7 @@ UNSUPPORTED = {
     ".pl": "perl", ".pm": "perl", ".clj": "clojure", ".erl": "erlang", ".hrl": "erlang", ".hs": "haskell", ".fs": "fsharp",
     ".fsx": "fsharp", ".groovy": "groovy", ".r": "r", ".jl": "julia", ".zig": "zig", ".sol": "solidity",
     ".qml": "qml", ".sh": "sh", ".bash": "sh", ".zsh": "sh", ".ksh": "sh", ".fish": "fish", ".ps1": "powershell",
-    ".psm1": "powershell", ".bat": "batch", ".cmd": "batch", ".svelte": "svelte", ".astro": "astro",
+    ".psm1": "powershell", ".bat": "batch", ".cmd": "batch", ".svelte": "svelte",
     ".coffee": "coffeescript", ".elm": "elm", ".ml": "ocaml", ".mli": "ocaml", ".nim": "nim", ".cr": "crystal",
     ".rkt": "racket", ".tcl": "tcl", ".vb": "visual-basic", ".cu": "cuda", ".cuh": "cuda", ".gd": "gdscript",
     ".hx": "haxe", ".pas": "pascal", ".f90": "fortran", ".f95": "fortran", ".adb": "ada", ".ads": "ada", ".vala": "vala",
@@ -58,7 +58,7 @@ MAX_PATHS = 500      # file paths stored per bucket in the index (counts are alw
 SHOW_PATHS = 5       # shown per bucket by default (`cg coverage --all-files` / coverage(all_files=true) for all)
 HINTS = {
     "php": "install PHP 8.2+ and Composer, then run `cg setup php` (`cg doctor` checks the toolchains)",
-    "typescript": "install Node.js 20+ (with npm), then run `cg setup typescript` (`cg doctor` checks the toolchains)",
+    "typescript": "install Node.js 20+ (with npm) or Bun, or set CODEGRAPH_NODE, then run `cg setup typescript` (`cg doctor` checks the toolchains)",
     "dart": "install the Dart SDK 3.x (`dart` on PATH or $DART), then run `cg setup dart`",
     "rust": "exact mode needs rust-analyzer (`rustup component add rust-analyzer`){layer}",
     "c_cpp": "exact mode needs scip-clang and a compile_commands.json (docs/native.md){layer}",

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/codegraph/doctor.py

@@ -104,7 +104,8 @@ def _tools() -> dict:
     from .plugins.swift.exact import find_swift
     home = Path.home()
     found = {
-        "node": shutil.which("node"), "npm": shutil.which("npm"), "php": shutil.which("php"),
+        "node": shutil.which(extractors._override() or "node"),
+        "npm": shutil.which("npm"), "bun": shutil.which("bun"), "php": shutil.which("php"),
         "composer": shutil.which("composer"), "dart": find_dart(),
         "rust-analyzer": find_tool("CODEGRAPH_RUST_ANALYZER", ["rust-analyzer"], [home / ".cargo" / "bin"]),
         "cargo": os.environ.get("CODEGRAPH_CARGO") or shutil.which("cargo") or
@@ -143,14 +144,17 @@ def _languages(tools: dict, root: Path | None, cfg: dict) -> list[dict]:
 
     add("python", "exact", "built-in parser (Python ast)")
     st = extractors.status("typescript")
-    if not has("node"):
-        add("typescript", "unavailable", "node not installed (Node.js 20+ runs the TypeScript extractor)",
-            "install Node.js 20+ (https://nodejs.org or your package manager), then `cg setup typescript`")
-    elif not st["installed"] and not has("npm"):
-        add("typescript", "unavailable", "extractor dependencies missing and npm not installed", "install npm, then `cg setup typescript`")
+    rt = extractors.js_runtime()
+    if rt is None:
+        add("typescript", "unavailable", extractors.js_runtime_problem(),
+            "install Node.js 20+ or Bun (or set CODEGRAPH_NODE), then `cg setup typescript`")
+    elif not st["installed"] and not has("npm") and not has("bun"):
+        add("typescript", "unavailable", "extractor dependencies missing and npm not installed",
+            "install npm, then `cg setup typescript`")
     else:
-        add("typescript", "exact", "TypeScript compiler API" + ("" if st["installed"] else
-            "; its npm dependencies install on the first index (or now: `cg setup typescript`)"))
+        add("typescript", "exact", f"TypeScript compiler API (runtime: {rt['kind']} {rt['path']})" + (
+            "" if st["installed"] else "; its npm dependencies install on the first index (or now: `cg setup typescript`)"),
+            runtime={"kind": rt["kind"], "path": rt["path"], "source": rt["source"]})
     st = extractors.status("php")
     if not has("php"):
         add("php", "unavailable", "php not installed (PHP 8.2+ runs the PHP extractor)", "install PHP 8.2+ and Composer, then `cg setup php`")
@@ -434,9 +438,17 @@ def setup(langs: list[str] | None = None, quiet: bool = False) -> int:
         tool = {"typescript": "npm", "php": "composer", "dart": None}[lang]
         need = {"typescript": "node", "php": "php", "dart": None}[lang]
         dart = find_dart() if lang == "dart" else None
-        if (need and not shutil.which(need)) or (tool and not shutil.which(tool) and not extractors.status(lang)["installed"]) \
-                or (lang == "dart" and not dart):
-            msg = f"{lang}: skipped ({'dart' if lang == 'dart' else need if need and not shutil.which(need) else tool} not installed)"
+        if lang == "typescript":
+            rt = extractors.js_runtime()
+            can_install = extractors.status(lang)["installed"] or bool(shutil.which("npm") or shutil.which("bun"))
+            skip = rt is None or not can_install
+            detail = extractors.js_runtime_problem() if rt is None else "npm or bun not installed"
+        else:
+            skip = (need and not shutil.which(need)) or (tool and not shutil.which(tool) and not extractors.status(lang)["installed"]) \
+                or (lang == "dart" and not dart)
+            detail = f"{'dart' if lang == 'dart' else need if need and not shutil.which(need) else tool} not installed"
+        if skip:
+            msg = f"{lang}: skipped ({detail})"
             print(msg, file=sys.stderr)
             rc = rc or (1 if langs else 0)
             continue

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/codegraph/indexer.py

@@ -26,12 +26,13 @@ from .plugins.flutter.plugin import FlutterPlugin
 from .plugins.nest.plugin import NestPlugin
 from .plugins.nextjs.plugin import NextPlugin
 from .plugins.express.plugin import ExpressPlugin
+from .plugins.astro.plugin import AstroPlugin
 from .plugins.kotlin.plugin import KotlinPlugin
 from .plugins.swift.plugin import SwiftPlugin
 
 LANGUAGE_PLUGINS = [PhpPlugin(), TypeScriptPlugin(), PythonPlugin(), DartPlugin(), RustPlugin(), CFamilyPlugin(), KotlinPlugin(), SwiftPlugin(),
                     *SCIP_PLUGINS]
-FRAMEWORK_PLUGINS = [LaravelPlugin(), NuxtPlugin(), DjangoPlugin(), FastAPIPlugin(), FlaskPlugin(), FlutterPlugin(), NestPlugin(), NextPlugin(), ExpressPlugin()]
+FRAMEWORK_PLUGINS = [LaravelPlugin(), NuxtPlugin(), DjangoPlugin(), FastAPIPlugin(), FlaskPlugin(), FlutterPlugin(), NestPlugin(), NextPlugin(), ExpressPlugin(), AstroPlugin()]
 
 
 def _crash_site(ex: BaseException) -> str | None:

cg_code_graph-0.15.0/codegraph/plugins/astro/plugin.py

@@ -0,0 +1,126 @@
+"""Astro framework layer (on the TypeScript plugin).
+
+  pages        src/pages/**.astro -> page node (route `/`, `/books/{slug}`, `/docs/{rest*}`; entry ui_page).
+               A segment starting with `_` is skipped. Frontmatter and <script> blocks are TypeScript at
+               their real lines (the extractor); template expressions are not code.
+  endpoints    src/pages/**.{ts,js,mts,mjs} exporting GET/POST/... (`ALL` -> ANY) -> one route each
+  components   <Card /> in the template -> RENDERS; imports from .ts and other .astro files resolve
+  getStaticPaths  recorded as attrs.get_static_paths when the frontmatter exports it (not evaluated)
+  is:inline    <script is:inline> counted on the file node as attrs.inline_scripts
+"""
+from __future__ import annotations
+
+import re
+
+from ...core.plugin import FrameworkPlugin, GraphBuilder, Project
+from ..tsweb.common import HTTP_VERBS, add_route, finish, fw_facts, merge_extractor_cfg, register, pkg_deps
+
+CONFIG_FILES = ("astro.config.mjs", "astro.config.js", "astro.config.ts", "astro.config.mts", "astro.config.cjs")
+_PAGE_EXT = (".astro", ".mts", ".mjs", ".ts", ".js")
+_GSP = re.compile(r"export\s+(?:async\s+)?function\s+getStaticPaths\b|export\s+const\s+getStaticPaths\b")
+_FM_OPEN = re.compile(r"\ufeff?\s*---[ \t]*\r?\n")
+_INLINE = re.compile(r"<script\b([^>]*)>", re.I)
+_CATCHALL = re.compile(r"\[\.\.\.([^\]]+)\]")
+_PARAM = re.compile(r"\[([^\]]+)\]")
+_ENDPOINT = re.compile(r"^src/pages/.+\.(?:ts|js|mts|mjs)$")
+
+
+def astro_route(rel: str) -> str | None:
+    """src/pages path -> `/`, `/books/{slug}`, `/docs/{rest*}`. None when a segment starts with `_`."""
+    rel = rel.replace("\\", "/")
+    if not rel.startswith("src/pages/") or rel.endswith(".d.ts"):
+        return None
+    rest = rel[len("src/pages/"):]
+    for ext in _PAGE_EXT:
+        if rest.endswith(ext):
+            rest = rest[: -len(ext)]
+            break
+    segs = [s for s in rest.split("/") if s]
+    if any(s.startswith("_") for s in segs):
+        return None
+    if segs and segs[-1] == "index":
+        segs.pop()
+    segs = [_PARAM.sub(r"{\1}", _CATCHALL.sub(r"{\1*}", s)) for s in segs]
+    return "/" + "/".join(segs)
+
+
+def _split(text: str) -> tuple[str, str]:
+    """(frontmatter, template), as the extractor reads them: an empty frontmatter counts, an unclosed one runs to
+    the end of the file."""
+    m = _FM_OPEN.match(text)
+    if not m:
+        return "", text
+    start = m.end()
+    end = text.find("\n---", start - 1)
+    if end < 0:
+        return text[start:], ""
+    return text[start:max(start, end)], text[end + 4:]
+
+
+def _inline_scripts(template: str) -> int:
+    return sum(1 for m in _INLINE.finditer(template) if re.search(r"\bis:inline\b", m.group(1)))
+
+
+class AstroPlugin(FrameworkPlugin):
+    name, language = "astro", "typescript"
+
+    def detect(self, project: Project) -> bool:
+        return "astro" in pkg_deps(project.root) or any(project.exists(f) for f in CONFIG_FILES)
+
+    def register_hooks(self, ctx) -> None:
+        root = ctx.project.root
+        cfg = ctx.extractor_cfg
+        kinds = cfg.setdefault("kinds", [])
+        kinds.extend([("src/pages/", "page"), ("src/layouts/", "layout"), ("src/components/", "component")])
+        merge_extractor_cfg(cfg, src_dirs=["src"], walk_src=not (root / "tsconfig.json").exists())
+        register(ctx, self.name)
+
+    def contribute(self, project: Project, b: GraphBuilder, ctx) -> dict:
+        st = {"pages": 0, "endpoints": 0, "layouts": 0, "components": 0, "inline_scripts": 0, "get_static_paths": 0}
+        for n in b.nodes.values():
+            if not n.file or not n.file.endswith(".astro") or n.kind not in ("page", "layout", "component"):
+                continue
+            try:
+                text = (project.root / n.file).read_text(encoding="utf-8", errors="replace")
+            except OSError:
+                text = ""
+            if n.kind == "page":
+                route = astro_route(n.file)
+                if route is not None:
+                    n.name = n.fqn = route
+                    n.attrs.update(route=route, uri=route, framework="astro")
+                    n.entry_kind = "ui_page"
+                    st["pages"] += 1
+                    if _GSP.search(_split(text)[0]):
+                        n.attrs["get_static_paths"] = True
+                        st["get_static_paths"] += 1
+            elif n.kind == "layout":
+                st["layouts"] += 1
+            else:
+                st["components"] += 1
+            inline = _inline_scripts(_split(text)[1])
+            if inline:
+                n.attrs["inline_scripts"] = inline
+                st["inline_scripts"] += inline
+        mods = (fw_facts(ctx).get("modules") or {})
+        for f, mod in mods.items():
+            if f.endswith(".d.ts") or not _ENDPOINT.match(f):
+                continue
+            uri = astro_route(f)
+            if uri is None:
+                continue
+            for ex in mod.get("exports") or []:
+                name = ex.get("name") or ""
+                if name == "ALL":
+                    verb = "ANY"
+                elif name in HTTP_VERBS:
+                    verb = name
+                else:
+                    continue
+                node = ex.get("node")
+                handlers = [node] if node and b.has(node) else []
+                add_route(b, verb, uri, handlers, f, ex.get("line") or 1, "astro",
+                          "exact" if handlers else "resolved", {"file_route": True})
+                st["endpoints"] += 1
+        st.update(finish(project, b, ctx, self.name))
+        return st

{cg_code_graph-0.14.0 → cg_code_graph-0.15.0}/codegraph/plugins/ts/extractor/extract.mjs

@@ -54,6 +54,8 @@ const EXCLUDE_FILES = new Set(cfg.exclude_files || [])
 const GENERATED_REL = cfg.generated_re ? new RegExp(cfg.generated_re) : null
 const excludedRel = r => !!(EXCLUDE_REL && EXCLUDE_REL.test(r)) || (!included(r.replace(/\/$/, '')) && (!!(GENERATED_REL && GENERATED_REL.test(r)) || EXCLUDE_FILES.has(r)))
 const SRC_EXT = /\.(ts|tsx|mts|cts|js|jsx|mjs|cjs)$/
+const SFC_RE = /\.(vue|astro)$/
+const SFC_TS_RE = /\.(vue|astro)\.ts$/
 // test code (Vitest / Jest / Playwright / Cypress): indexed as test nodes unless cfg.index_tests === false; kept out of
 // the application graph by the indexer (TEST_* edges)
 const INDEX_TESTS = cfg.index_tests !== false
@@ -65,7 +67,7 @@ const isTestRel = r => TEST_FILE_RE.test(r) || /(^|\/)__tests__\//.test(r) || TE
 // ---------- file kinds (from the framework plugin: [[prefix, kind], ...]) ----------
 function fileKind(r) {
   for (const [prefix, kind] of cfg.kinds || []) if (r.startsWith(prefix)) return kind
-  return r.endsWith('.vue') ? 'component' : 'module'
+  return SFC_RE.test(r) ? 'component' : 'module'
 }
 
 // ---------- global components (Nuxt .nuxt/types/components.d.ts) ----------
@@ -327,14 +329,15 @@ if (INDEX_TESTS) {
   if (found.size) process.stderr.write(`codegraph: scripts the tests run: ${[...found].map(rel).sort().join(', ')}\n`)
 }
 const vueFiles = allFiles.filter(f => f.endsWith('.vue'))
-const vueSet = new Set(vueFiles)
+const astroFiles = allFiles.filter(f => f.endsWith('.astro'))
+const vueSet = new Set([...vueFiles, ...astroFiles])
 
 // ---------- virtual sources for .vue ----------
 const virtual = new Map()       // virtual path -> text
 const lineMaps = new Map()      // virtual path -> {virtualLine(1-based): origLine}
 const sfcInfo = new Map()
 const sfcI18n = {}             // rel vue path -> keys defined in <i18n> blocks       // vue abs path -> {templateTags:[...], pageMeta}
-const stats = { vue_files: vueFiles.length, ts_files: 0, template_stubs: 0, template_component_tags: 0,
+const stats = { vue_files: vueFiles.length, astro_files: astroFiles.length, ts_files: 0, template_stubs: 0, template_component_tags: 0,
   sfc_errors: 0, components_global: 0, components_imported: 0, components_external: 0, components_unknown: 0, unknown_tags: {} }
 const sfcNav = []               // static <NuxtLink to> / <RouterLink to> / <a href>
 function internalHref(v) {
@@ -458,6 +461,59 @@ function buildVirtualVue(file) {
 }
 for (const f of vueFiles) virtual.set(f + '.ts', buildVirtualVue(f))
 
+// .astro: frontmatter and <script> bodies stay at their real offsets; component tags become
+// __tplc_ stubs with a line map. `export {}` makes a frontmatter with no import/export a module.
+function astroScriptKept(attrs) {
+  const m = /\btype\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+))/i.exec(attrs || '')
+  if (!m) return true
+  const t = (m[1] || m[2] || m[3] || '').trim()
+  return /^(?:module|text\/javascript|text\/typescript)$/i.test(t)
+}
+// frontmatter: `---` on the first line, up to the next line starting with `---` (an empty one included); an
+// unclosed fence runs to the end of the file, as in the Astro compiler
+function astroFrontmatter(src) {
+  const open = /^\s*---[ \t]*\r?\n/.exec(src)
+  if (!open) return null
+  const start = open[0].length
+  const close = /\n---/g
+  close.lastIndex = start - 1
+  const c = close.exec(src)
+  return c ? { start, end: Math.max(start, c.index), tpl: c.index + 4 } : { start, end: src.length, tpl: src.length }
+}
+function buildVirtualAstro(file) {
+  let src
+  try { src = fs.readFileSync(file, 'utf8') } catch (e) { process.stderr.write(`codegraph: skipping ${rel(file)}: ${e.code || e}\n`); return '' }
+  const keep = []
+  const fm = astroFrontmatter(src)
+  if (fm) keep.push([fm.start, fm.end])
+  // one pass over the template: comments, <script> / <style> (an unclosed one runs to the end) and component tags
+  const stubs = []
+  let n = 0, line = 1, at = 0
+  const lineAt = i => { for (; at < i; at++) if (src.charCodeAt(at) === 10) line++; return line }
+  const re = /<!--[\s\S]*?(?:-->|$)|<(script|style)\b([^>]*)>([\s\S]*?)(?:<\/\1\s*>|$)|<([A-Z][\w$]*)/g
+  re.lastIndex = fm ? fm.tpl : 0
+  let m
+  while ((m = re.exec(src))) {
+    if (m[1] === 'script' && astroScriptKept(m[2])) {
+      const s = m.index + 1 + m[1].length + m[2].length + 1
+      keep.push([s, s + m[3].length])
+    } else if (m[4]) {
+      stubs.push([`function __tplc_${n++}() { return typeof ${m[4]} }`, lineAt(m.index)])
+      stats.template_stubs++
+      stats.template_component_tags++
+    }
+  }
+  const text = blank(src, keep)
+  const baseLines = text.split('\n').length
+  const lm = {}
+  let out = text
+  stubs.forEach(([code, l], i) => { lm[baseLines + 1 + i] = l; out += '\n' + code })
+  out += '\nexport {}'
+  lineMaps.set(file + '.ts', lm)
+  return out
+}
+for (const f of astroFiles) virtual.set(f + '.ts', buildVirtualAstro(f))
+
 // ---------- compiler host ----------
 const host = ts.createCompilerHost(options, true)
 const origGetSourceFile = host.getSourceFile.bind(host)
@@ -483,8 +539,8 @@ function resolveVuePath(spec, containing) {
 }
 host.resolveModuleNameLiterals = (lits, containing, redirected, opts) => lits.map(l => {
   const spec = l.text
-  const containingReal = containing.endsWith('.vue.ts') ? containing.slice(0, -3) : containing
-  if (spec.endsWith('.vue')) {
+  const containingReal = SFC_TS_RE.test(containing) ? containing.slice(0, -3) : containing
+  if (SFC_RE.test(spec)) {
     const p = resolveVuePath(spec, containingReal)
     if (p) return { resolvedModule: { resolvedFileName: p + '.ts', extension: ts.Extension.Ts, isExternalLibraryImport: false } }
   }
@@ -515,12 +571,12 @@ const projectSf = sf => {
   const fn = sf.fileName
   let v = projectSfMemo.get(fn)
   if (v !== undefined) return v
-  const real = fn.endsWith('.vue.ts') ? fn.slice(0, -3) : fn
+  const real = SFC_TS_RE.test(fn) ? fn.slice(0, -3) : fn
   v = testFiles.has(real) || (!sourceSkipped(rel(real)) && (srcFiles.has(real) || srcDirs.some(d => real.startsWith(d + path.sep))) && !SKIP_FILE.test(real) && !real.endsWith('.d.ts') && !(SKIP_REL && SKIP_REL.test(rel(real))) && !excludedRel(rel(real)))
   projectSfMemo.set(fn, v)
   return v
 }
-const realFile = sf => sf.fileName.endsWith('.vue.ts') ? sf.fileName.slice(0, -3) : sf.fileName
+const realFile = sf => SFC_TS_RE.test(sf.fileName) ? sf.fileName.slice(0, -3) : sf.fileName
 function lineOf(node, sf = node.getSourceFile()) {
   const l = sf.getLineAndCharacterOfPosition(node.getStart(sf)).line + 1
   const lm = lineMaps.get(sf.fileName)
@@ -1006,7 +1062,7 @@ const implementedIfaces = new Set()
     else if (classOfValue(n)) for (const d of ctorIfaces(n)) addIface(d)
     ts.forEachChild(n, walk)
   }
-  for (const sf of sourceFiles) if (!realFile(sf).endsWith('.vue')) walk(sf)
+  for (const sf of sourceFiles) if (!SFC_RE.test(realFile(sf))) walk(sf)
 }
 const isFnType = t => t && (ts.isFunctionTypeNode(t) || (ts.isParenthesizedTypeNode(t) && isFnType(t.type)))
 // members of an interface / object type alias: `method:<file>#Iface.member` (attrs.signature; no body). A call on an
@@ -1037,25 +1093,25 @@ for (const sf of sourceFiles) {
     const txt = sf.text
     testFramework = /@playwright\/test/.test(txt) ? 'playwright' : /from ['"]vitest['"]/.test(txt) ? 'vitest' : /\bcy\./.test(txt) ? 'cypress' : /@jest\/globals|jest\./.test(txt) ? 'jest' : 'test'
   }
-  if (!real.endsWith('.vue')) stats.ts_files++
+  if (!SFC_RE.test(real)) stats.ts_files++
   if (sf.parseDiagnostics && sf.parseDiagnostics.length) {   // the parser recovers; count files that needed recovery
     stats.syntax_error_files = (stats.syntax_error_files || 0) + 1
     if ((stats.syntax_error_samples ||= []).length < 5) stats.syntax_error_samples.push(r)
     // error lines per file for `cg coverage` (#73); in a .vue file only those of its <script> blocks (the template
     // stubs are appended after the file's own lines)
     let maxLine = Infinity
-    if (real.endsWith('.vue')) { try { maxLine = fs.readFileSync(real, 'utf8').split('\n').length } catch (e) { maxLine = 0 } }
+    if (SFC_RE.test(real)) { try { maxLine = fs.readFileSync(real, 'utf8').split('\n').length } catch (e) { maxLine = 0 } }
     const lines = [...new Set(sf.parseDiagnostics.map(d => sf.getLineAndCharacterOfPosition(d.start || 0).line + 1))]
       .filter(l => l <= maxLine).slice(0, 20)
     const se = (stats.syntax_errors ||= {})
     if (lines.length && Object.keys(se).length < 500) se[r] = lines.map(l => [l, l])
   }
-  const fid = real.endsWith('.vue') ? `${fk}:${r}` : `module:${r}`
+  const fid = SFC_RE.test(real) ? `${fk}:${r}` : `module:${r}`
   usedIds.add(fid)
   fileNode.set(real, fid)
-  nodes.push({ id: fid, kind: real.endsWith('.vue') ? fk : 'module', name: r, file: r, line: 1, end_line: sf.getLineAndCharacterOfPosition(sf.end).line + 1, attrs: { file_kind: fk, ...(isTestSf ? { test: true } : {}) } })
+  nodes.push({ id: fid, kind: SFC_RE.test(real) ? fk : 'module', name: r, file: r, line: 1, end_line: sf.getLineAndCharacterOfPosition(sf.end).line + 1, attrs: { file_kind: fk, ...(isTestSf ? { test: true } : {}) } })
   modNode.set(fid, nodes[nodes.length - 1])
-  if (real.endsWith('.vue')) continue // SFC: references are attributed to the component node
+  if (SFC_RE.test(real)) continue // SFC: references are attributed to the file node
   const visit = (node, qual, parentId, inObj) => {
     let name = null, kind = null, body = null, wrapped = null
     if (!qual && !inObj && ts.isVariableDeclaration(node) && ts.isIdentifier(node.name) && node.initializer
@@ -1293,7 +1349,7 @@ function resolveSymbol(sym, conf = 'exact', via = []) {
     if (sym.flags & ts.SymbolFlags.Alias) {
       const ad = (sym.declarations || [])[0]
       const imp = ad && (ts.isImportClause(ad) ? ad.parent : (ts.isImportSpecifier(ad) ? ad.parent.parent.parent : null))
-      if (imp && ts.isImportDeclaration(imp) && imp.moduleSpecifier.text.endsWith('.vue')) {
+      if (imp && ts.isImportDeclaration(imp) && SFC_RE.test(imp.moduleSpecifier.text)) {
         const ms = checker.getSymbolAtLocation(imp.moduleSpecifier); const sd = ms && (ms.declarations || [])[0]
         if (sd && ts.isSourceFile(sd) && fileNode.has(realFile(sd))) return { id: fileNode.get(realFile(sd)), conf, via: [...via, 'import'] }
       }
@@ -1850,7 +1906,7 @@ const callSites = []
   // structural: `new X()` where an interface type is expected (`const api: FeedAPI = new X()`, an argument, a return
   // value) and X does not declare `implements` it
   for (const sf of sourceFiles) {
-    if (realFile(sf).endsWith('.vue') || !sf.text.includes('new ')) continue
+    if (SFC_RE.test(realFile(sf)) || !sf.text.includes('new ')) continue
     const r = rel(realFile(sf))
     const done = new Set()
     const walk = n => {
@@ -1880,7 +1936,7 @@ const callSites = []
   // constructor of an interface is expected (`register(FollowingFeedAPI)`): structurally, as for `new X()`
   let nol = 0
   for (const sf of sourceFiles) {
-    if (realFile(sf).endsWith('.vue')) continue
+    if (SFC_RE.test(realFile(sf))) continue
     const r = rel(realFile(sf))
     const done = new Set()
     const walk = n => {
@@ -2438,7 +2494,7 @@ function edgeKindFor(targetId, isCall) {
 for (const sf of sourceFiles) { const real = realFile(sf); optionsFields(sf, rel(real), fileNode.get(real)) }
 for (const sf of sourceFiles) {
   const real = realFile(sf), r = rel(real), fid = fileNode.get(real)
-  const isVue = real.endsWith('.vue')
+  const isVue = SFC_RE.test(real)
   const stack = [fid]
   const fnStack = []
   const visit = node => {