universal-ast-mapper 0.8.1 → 0.8.2

package/README.md

@@ -10,12 +10,12 @@ Built on [tree-sitter](https://tree-sitter.github.io/) WASM grammars. Zero regex
 |--------------------------|:-----:|:------:|:---:|:----:|:----:|:---:|:---:|:---:|:---:|:-----:|
 | Symbol extraction        | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | ✅  | ✅  | ✅  | ✅    |
 | Imports parsing          | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | ✅  | ✅  | ✅  | ✅    |
-| Graph `imports` edges    | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | —   | —   | —   | —     |
-| `resolve_imports` enrich | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | —   | —   | —   | —     |
-| Call graph callee origin | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | —   | —   | —   | —     |
-| Reverse `calledBy`       | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | —   | —   | —   | —     |
+| Graph `imports` edges    | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | ✅  | ✅  | ✅  | ✅    |
+| `resolve_imports` enrich | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | ✅  | ✅  | ✅  | ✅    |
+| Call graph callee origin | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | —   | —   | ✅  | —     |
+| Reverse `calledBy`       | ✅    | ✅     | ✅  | ✅   | ✅   | ✅  | —   | —   | ✅  | —     |
 
-> v0.8.0 introduces **symbol extraction + imports parsing** for C / C++ / Kotlin / Swift. Graph/resolver/callgraph dispatch for these four lands in a follow-up release. (Ruby grammar in `tree-sitter-wasms@0.1.13` is unstable and was skipped.)
+> As of v0.8.2, all four v0.8.0 languages have **cross-file graph + resolver** wiring: Kotlin (FQCN/package index), C/C++ (`#include` with header↔impl pairing), and Swift (module = directory under `Sources/`). Call-graph callee origin is resolved for Kotlin; for C/C++/Swift it stays limited because their imports don't name individual symbols. (Ruby grammar in `tree-sitter-wasms@0.1.13` is unstable and was skipped.)
 
 Each language uses the resolution strategy that fits it:
 - **TS/JS/Python** — relative paths (`./foo`, `..mod`) resolved against the importing file's directory, with TS-ESM `.js` → `.ts` rewriting.
@@ -23,6 +23,8 @@ Each language uses the resolution strategy that fits it:
 - **Rust** — `Cargo.toml` ancestor → `crate::` / `self::` / `super::` walks; supports `mod.rs` + Rust-2018 sibling-dir style.
 - **Java** — project-wide FQCN index (`package + "." + className → file`) built lazily on first cross-lang call; supports wildcard imports.
 - **C#** — namespace-to-files index plus a `<ns>.<TypeName>` index so `using App.Models` + `new Inventory()` resolves to the right file.
+- **Kotlin** — project-wide FQCN index (`package + "." + ClassName → file`), like Java; wildcard `import pkg.*` pulls every file in the package.
+- **C / C++** — `#include "..."` resolved against the including file's directory; headers auto-paired with same-name `.c`/`.cpp`/`.cc`/`.cxx` impl files. `<system>` includes stay external.
 
 For C# and Go (where imports don't name the called symbol), reverse `calledBy` falls back to **call-site scanning** of candidate files.
 
@@ -290,7 +292,7 @@ Parse a function body → extract every call expression, resolve callees via the
 ```
 
 Supports all 8 languages with per-language call extraction (TS/JS `member_expression`, Rust `field_expression`/`scoped_identifier`, Java `method_invocation`, C# `invocation_expression`, etc.) and constructor calls (`new Foo`).  
-Handles TS/JS destructured aliases (`const { sign } = jwt`), Java FQCN imports, C# `using` namespaces (via project-wide type index), Rust `use crate::path::Item`, Go `pkg.Func` (via go.mod module path). Reverse `calledBy` uses call-site scanning for C# and Go where import statements don't name the called symbol.
+Handles TS/JS destructured aliases (`const { sign } = jwt`), Java FQCN imports, C# `using` namespaces (via project-wide type index), Rust `use crate::path::Item`, Go `pkg.Func` (via go.mod module path), Kotlin FQCN/package imports, C/C++ `#include`, and Swift module imports (`import <Module>` → files under `Sources/<Module>/`). Reverse `calledBy` uses call-site scanning for C# and Go where import statements don't name the called symbol.
 
 **Params:** `path`, `function`, `scanDir`
 
@@ -480,6 +482,7 @@ src/
 
 | Version | What changed |
 |---------|--------------|
+| **0.8.2** | **Swift cross-file wiring** — `import <Module>` resolves to that module's files (module = the `Sources/<Module>/` directory, else parent dir), wired into `build_symbol_graph` + `resolve_imports`. System modules (Foundation, UIKit, …) stay external. Completes cross-file graph/resolver support for all four v0.8.0 languages. |
 | **0.8.1** | **Cross-file graph wiring for Kotlin & C/C++** — Kotlin FQCN/package index + C/C++ `#include` resolution (with header↔impl pairing) wired into `build_symbol_graph`, `resolve_imports`, and `get_call_graph`. Fixes a parse-cache rel-path leak (stale `.file` poisoned the cross-lang index → doubled paths) and Kotlin call-graph extraction (`function_declaration` name + field-less `call_expression`). |
 | **0.8.0** | **4 new languages: C · C++ · Kotlin · Swift** — symbol extraction + imports parsing. C++ tracks access_specifier through class bodies. Kotlin handles `package`/`object`/`data class`. Swift handles `class`/`struct`/`enum` (all under `class_declaration`) and `protocol_declaration`. Ruby grammar in tree-sitter-wasms@0.1.13 is unstable — skipped. |
 | **0.7.0** | Go full resolution (reads `go.mod`, resolves package-as-directory) · C# reverse `calledBy` via call-site scanning · `csharpTypes` index lets `using` directives resolve to specific types · 4-suite test harness (smoke + graph-smoke + resolver-smoke + callgraph-smoke) |

package/dist/callgraph.js

@@ -6,7 +6,7 @@ import { resolveOptions, loadProjectConfig } from "./config.js";
 import { detectLanguage } from "./registry.js";
 import { resolveImportPath, getOrBuildCrossLangIndex } from "./resolver.js";
 import { resolveCrossLangTarget } from "./crosslang.js";
-const CROSS_LANG = new Set(["java", "csharp", "rust", "go", "kotlin", "c", "cpp"]);
+const CROSS_LANG = new Set(["java", "csharp", "rust", "go", "kotlin", "c", "cpp", "swift"]);
 function pushCall(out, callee, anchor) {
     if (callee && anchor)
         out.push({ callee, line: anchor.startPosition.row + 1 });

package/dist/crosslang.js

@@ -26,6 +26,7 @@ export function buildCrossLangIndex(skeletons) {
         csharpTypes: new Map(),
         kotlinFqcn: new Map(),
         kotlinPackages: new Map(),
+        swiftModules: new Map(),
     };
     for (const skel of skeletons) {
         if (skel.language === "java") {
@@ -68,9 +69,32 @@ export function buildCrossLangIndex(skeletons) {
                 index.kotlinFqcn.set(`${pkg}.${sym.name}`, skel.file);
             }
         }
+        else if (skel.language === "swift") {
+            const mod = swiftModuleOf(skel.file);
+            if (!mod)
+                continue;
+            const arr = index.swiftModules.get(mod) ?? [];
+            arr.push(skel.file);
+            index.swiftModules.set(mod, arr);
+        }
     }
     return index;
 }
+/**
+ * Derive a Swift module name from a project-relative file path.
+ * SwiftPM convention: sources live under `Sources/<ModuleName>/...`, so the
+ * module is the path segment right after `Sources`. For flat layouts we fall
+ * back to the immediate parent directory name. Returns null for bare files.
+ */
+function swiftModuleOf(relFile) {
+    const parts = relFile.split("/");
+    const srcIdx = parts.lastIndexOf("Sources");
+    if (srcIdx >= 0 && srcIdx + 1 < parts.length - 1)
+        return parts[srcIdx + 1];
+    if (parts.length >= 2)
+        return parts[parts.length - 2];
+    return null;
+}
 /* ─── Rust module resolution ──────────────────────────────────────────────── */
 function findCargoRoot(fromAbs, projectRoot) {
     let dir = path.dirname(fromAbs);
@@ -385,5 +409,17 @@ export function resolveCrossLangTarget(imp, skel, fromAbs, projectRoot, index) {
             return null;
         return { kind: "file", files: filtered };
     }
+    if (skel.language === "swift") {
+        // `import <Module>` brings in another in-project module's public symbols
+        // (no symbol named). Resolve to that module's files; unknown modules
+        // (Foundation, UIKit, …) are external.
+        const files = index.swiftModules.get(imp.from);
+        if (files && files.length > 0) {
+            const filtered = files.filter((f) => f !== skel.file);
+            if (filtered.length > 0)
+                return { kind: "file", files: filtered };
+        }
+        return null;
+    }
     return null;
 }

package/dist/graph.js

@@ -142,7 +142,8 @@ export function buildSymbolGraph(skeletons, root) {
                 skel.language === "go" ||
                 skel.language === "kotlin" ||
                 skel.language === "c" ||
-                skel.language === "cpp") {
+                skel.language === "cpp" ||
+                skel.language === "swift") {
                 wireCrossLangImport(skel, imp, fromFileAbs, root, crossIndex, exportedSymbolMap, edges);
             }
         }

package/dist/resolver.js

@@ -81,7 +81,7 @@ export async function getOrBuildCrossLangIndex(root) {
             const ext = path.extname(abs).toLowerCase();
             // Only Java/C# contribute to the index (Rust resolves via direct
             // module-path walk against the filesystem, no index needed).
-            if (ext !== ".java" && ext !== ".cs" && ext !== ".kt" && ext !== ".kts")
+            if (ext !== ".java" && ext !== ".cs" && ext !== ".kt" && ext !== ".kts" && ext !== ".swift")
                 continue;
             const rel = path.relative(key, abs).split(path.sep).join("/");
             try {
@@ -168,7 +168,7 @@ function assembleResolved(imp, resolvedAbs, resolvedRel, isExternal, enrichment)
     return out;
 }
 /* ─── Public entry point ──────────────────────────────────────────────────── */
-const CROSS_LANG = new Set(["java", "csharp", "rust", "go", "kotlin", "c", "cpp"]);
+const CROSS_LANG = new Set(["java", "csharp", "rust", "go", "kotlin", "c", "cpp", "swift"]);
 export async function resolveFileImports(skel, absPath, root) {
     if (!skel.imports || skel.imports.length === 0)
         return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "universal-ast-mapper",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "MCP server that maps source files into a normalized code skeleton (JSON + HTML) using tree-sitter.",
   "type": "module",
   "main": "dist/index.js",