@yuaone/core 0.4.8 → 0.5.0

package/dist/ast-analyzer.js

@@ -0,0 +1,344 @@
+/**
+ * @module ast-analyzer
+ * @description AST-based TypeScript/JavaScript code analysis using ts-morph.
+ *
+ * Provides accurate symbol extraction, import analysis, and reference finding
+ * that avoids regex false positives (symbols in comments/strings, type-only imports, etc.).
+ *
+ * Falls back gracefully when ts-morph cannot load the project (e.g., missing tsconfig).
+ */
+import { resolve, dirname } from "node:path";
+import { existsSync } from "node:fs";
+let TsMorphCtor = null;
+let tsMorphLoadAttempted = false;
+async function loadTsMorph() {
+    if (tsMorphLoadAttempted)
+        return TsMorphCtor ? { Project: TsMorphCtor } : null;
+    tsMorphLoadAttempted = true;
+    try {
+        const mod = await import("ts-morph");
+        TsMorphCtor = mod.Project;
+        return mod;
+    }
+    catch {
+        return null;
+    }
+}
+// ─── AstAnalyzer ───
+/**
+ * AST-based code analysis for TypeScript/JavaScript files.
+ *
+ * Uses ts-morph for accurate parsing — avoids regex false positives for symbols
+ * in comments/strings, correctly detects type-only imports, and finds precise
+ * symbol references.
+ *
+ * @example
+ * ```typescript
+ * const analyzer = new AstAnalyzer("/path/to/project");
+ * const symbols = await analyzer.extractSymbols("/path/to/file.ts");
+ * const refs = await analyzer.findReferences("/path/to/file.ts", "MyClass");
+ * const imports = await analyzer.getImports("/path/to/file.ts");
+ * const isType = await analyzer.isTypeOnlyImport("/path/to/file.ts", "Foo");
+ * ```
+ */
+export class AstAnalyzer {
+    projectPath;
+    /** Cached ts-morph Project instances keyed by tsconfig path */
+    projects = new Map();
+    constructor(projectPath) {
+        this.projectPath = resolve(projectPath);
+    }
+    // ─── Public API ───
+    /**
+     * Extract all exported symbols from a TypeScript/JavaScript file using AST.
+     *
+     * Returns functions, classes, interfaces, types, enums, and variables that
+     * are exported. Includes accurate line numbers from the AST (not regex estimates).
+     *
+     * @param filePath - Absolute or project-relative path to the file
+     * @returns Array of exported symbols, or empty array on failure
+     */
+    async extractSymbols(filePath) {
+        const absPath = resolve(filePath);
+        try {
+            const sf = await this.getSourceFile(absPath);
+            if (!sf)
+                return [];
+            return this.extractSymbolsFromSourceFile(sf, absPath);
+        }
+        catch {
+            return [];
+        }
+    }
+    /**
+     * Find all references to a named symbol across the project files.
+     *
+     * Uses ts-morph's language-service-level reference finder — accurate even for
+     * overloaded names, avoids matches inside comments or string literals.
+     *
+     * @param filePath - File where the symbol is defined
+     * @param symbolName - Name of the symbol to find references for
+     * @returns Array of references with file path, line, and source context
+     */
+    async findReferences(filePath, symbolName) {
+        const absPath = resolve(filePath);
+        try {
+            const sf = await this.getSourceFile(absPath);
+            if (!sf)
+                return [];
+            const results = [];
+            // Find the declaration node for the symbol in this file
+            const declarations = sf.getExportedDeclarations().get(symbolName) ?? [];
+            for (const decl of declarations) {
+                // SourceFile is in the ExportedDeclarations union but lacks findReferencesAsNodes
+                if (!("findReferencesAsNodes" in decl))
+                    continue;
+                const refs = decl.findReferencesAsNodes();
+                for (const ref of refs) {
+                    const refSf = ref.getSourceFile();
+                    const refFilePath = refSf.getFilePath();
+                    const line = ref.getStartLineNumber();
+                    const lineText = refSf.getFullText().split("\n")[line - 1] ?? "";
+                    results.push({
+                        file: refFilePath,
+                        line,
+                        context: lineText,
+                    });
+                }
+            }
+            return results;
+        }
+        catch {
+            return [];
+        }
+    }
+    /**
+     * Parse all import statements in a file via AST.
+     *
+     * Correctly identifies type-only imports (both `import type { X }` and
+     * `import { type X, Y }`).
+     *
+     * @param filePath - Absolute or project-relative path to the file
+     * @returns Array of parsed import information, or empty array on failure
+     */
+    async getImports(filePath) {
+        const absPath = resolve(filePath);
+        try {
+            const sf = await this.getSourceFile(absPath);
+            if (!sf)
+                return [];
+            return this.extractImportsFromSourceFile(sf);
+        }
+        catch {
+            return [];
+        }
+    }
+    /**
+     * Check whether a specific imported name is type-only in a file.
+     *
+     * Returns true if:
+     * - The entire import clause is `import type { X }`, or
+     * - The specific named import is `import { type X, Y }` (TS 4.5+ inline type modifier)
+     *
+     * @param filePath - Absolute or project-relative path to the file
+     * @param importedName - The name to check (e.g., "Foo")
+     * @returns true if the import is type-only, false otherwise
+     */
+    async isTypeOnlyImport(filePath, importedName) {
+        try {
+            const imports = await this.getImports(filePath);
+            for (const imp of imports) {
+                // Full clause type-only: import type { X, Y } from "…"
+                if (imp.isTypeOnly && imp.namedImports.includes(importedName))
+                    return true;
+                // Inline type modifier: import { type X, Y } from "…"
+                if (imp.typeOnlyNames.includes(importedName))
+                    return true;
+            }
+            return false;
+        }
+        catch {
+            return false;
+        }
+    }
+    // ─── Internal helpers ───
+    /**
+     * Get or create a ts-morph Project for the file's tsconfig.
+     * Falls back to a ts-morph Project with no tsconfig if one cannot be found.
+     */
+    async getProject(absFilePath) {
+        const mod = await loadTsMorph();
+        if (!mod)
+            return null;
+        const tsConfigPath = this.findTsConfig(absFilePath);
+        const cacheKey = tsConfigPath ?? "__no_tsconfig__";
+        if (this.projects.has(cacheKey)) {
+            return this.projects.get(cacheKey);
+        }
+        try {
+            let project;
+            if (tsConfigPath) {
+                project = new mod.Project({
+                    tsConfigFilePath: tsConfigPath,
+                    skipAddingFilesFromTsConfig: false,
+                    skipFileDependencyResolution: false,
+                });
+            }
+            else {
+                // No tsconfig found — use defaults so we can still parse individual files
+                project = new mod.Project({
+                    useInMemoryFileSystem: false,
+                    skipAddingFilesFromTsConfig: true,
+                });
+            }
+            this.projects.set(cacheKey, project);
+            return project;
+        }
+        catch {
+            // Construction failed (e.g., invalid tsconfig)
+            return null;
+        }
+    }
+    /**
+     * Get a ts-morph SourceFile for the given absolute path.
+     * Adds the file to the project if it's not already tracked.
+     */
+    async getSourceFile(absFilePath) {
+        const project = await this.getProject(absFilePath);
+        if (!project)
+            return null;
+        // Try to get from already-loaded files
+        let sf = project.getSourceFile(absFilePath);
+        if (!sf) {
+            try {
+                sf = project.addSourceFileAtPath(absFilePath);
+            }
+            catch {
+                return null;
+            }
+        }
+        return sf ?? null;
+    }
+    /**
+     * Walk up from the file's directory to find the nearest tsconfig.json.
+     * Stops at the project root.
+     */
+    findTsConfig(absFilePath) {
+        let dir = dirname(absFilePath);
+        const root = this.projectPath;
+        // Walk up directory tree until we reach the project root (or filesystem root)
+        while (dir.length >= root.length) {
+            const candidate = `${dir}/tsconfig.json`;
+            if (existsSync(candidate))
+                return candidate;
+            const parent = dirname(dir);
+            if (parent === dir)
+                break; // filesystem root
+            dir = parent;
+        }
+        // Also check project root tsconfig as last resort
+        const projectTsConfig = `${root}/tsconfig.json`;
+        if (existsSync(projectTsConfig))
+            return projectTsConfig;
+        return undefined;
+    }
+    /**
+     * Extract exported symbols from a ts-morph SourceFile.
+     */
+    extractSymbolsFromSourceFile(sf, filePath) {
+        const symbols = [];
+        // ts-morph getExportedDeclarations() returns a ReadonlyMap<string, ExportedDeclarations[]>
+        const exportedDecls = sf.getExportedDeclarations();
+        const defaultName = "__default__";
+        for (const [name, decls] of exportedDecls) {
+            const isDefault = name === "default";
+            const symbolName = isDefault ? defaultName : name;
+            for (const decl of decls) {
+                const kind = this.mapDeclarationKind(decl);
+                if (!kind)
+                    continue;
+                const startLine = decl.getStartLineNumber(true);
+                const endLine = decl.getEndLineNumber();
+                symbols.push({
+                    name: isDefault ? symbolName : name,
+                    kind,
+                    line: startLine,
+                    endLine,
+                    isDefault,
+                });
+            }
+        }
+        return symbols;
+    }
+    /**
+     * Map a ts-morph Node to our AstSymbol kind string.
+     * Returns undefined for node kinds we don't track.
+     */
+    mapDeclarationKind(decl) {
+        // Use ts-morph's SyntaxKind checks via getKindName()
+        const kindName = decl.getKindName();
+        if (kindName === "FunctionDeclaration" ||
+            kindName === "ArrowFunction" ||
+            kindName === "FunctionExpression") {
+            return "function";
+        }
+        if (kindName === "ClassDeclaration" || kindName === "ClassExpression") {
+            return "class";
+        }
+        if (kindName === "InterfaceDeclaration") {
+            return "interface";
+        }
+        if (kindName === "TypeAliasDeclaration") {
+            return "type";
+        }
+        if (kindName === "EnumDeclaration") {
+            return "enum";
+        }
+        if (kindName === "VariableDeclaration" ||
+            kindName === "VariableStatement") {
+            return "variable";
+        }
+        return undefined;
+    }
+    /**
+     * Extract import information from a ts-morph SourceFile.
+     */
+    extractImportsFromSourceFile(sf) {
+        const imports = [];
+        for (const importDecl of sf.getImportDeclarations()) {
+            const moduleSpecifier = importDecl.getModuleSpecifierValue();
+            const isTypeOnly = importDecl.isTypeOnly();
+            const line = importDecl.getStartLineNumber(true);
+            const namedImports = [];
+            const typeOnlyNames = [];
+            for (const named of importDecl.getNamedImports()) {
+                const nm = named.getName();
+                namedImports.push(nm);
+                // TS 4.5+: `import { type X, Y }` — individual type modifier
+                if (named.isTypeOnly()) {
+                    typeOnlyNames.push(nm);
+                }
+            }
+            const defaultImportNode = importDecl.getDefaultImport();
+            const namespaceImportNode = importDecl.getNamespaceImport();
+            imports.push({
+                moduleSpecifier,
+                namedImports,
+                defaultImport: defaultImportNode?.getText(),
+                namespaceImport: namespaceImportNode?.getText(),
+                isTypeOnly,
+                typeOnlyNames,
+                line,
+            });
+        }
+        return imports;
+    }
+    /**
+     * Dispose all cached ts-morph Project instances to free memory.
+     * Call this when analysis is complete.
+     */
+    dispose() {
+        this.projects.clear();
+    }
+}
+//# sourceMappingURL=ast-analyzer.js.map

package/dist/ast-analyzer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ast-analyzer.js","sourceRoot":"","sources":["../src/ast-analyzer.ts"],"names":[],"mappings":"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"}

package/dist/codebase-context.d.ts

@@ -3,8 +3,9 @@
  * @description Codebase Context Engine — indexes TypeScript/JavaScript projects,
  * extracts symbols, builds call graphs, and provides semantic search + blast radius analysis.
  *
- * Uses regex-based AST analysis (no ts-morph dependency). Designed for the YUAN coding agent
- * to understand project structure before making changes.
+ * Uses regex-based parsing with an optional ts-morph AST layer for improved accuracy on
+ * TypeScript/JavaScript files (avoids false positives in comments/strings, correctly detects
+ * type-only imports). Falls back to regex when ts-morph is unavailable.
  */
 import type { ImportRef } from "./dependency-analyzer.js";
 import { LanguageSupport } from "./language-support.js";
@@ -172,6 +173,8 @@ export declare class CodebaseContext {
     private reverseDepMap;
     /** Optional multi-language support for non-TS/JS files */
     private languageSupport;
+    /** AST-based analyzer for accurate TS/JS analysis (ts-morph) */
+    private astAnalyzer;
     constructor(projectPath: string, languageSupport?: LanguageSupport);
     /**
      * Build a full index of the project. Scans all source files,
@@ -343,10 +346,27 @@ export declare class CodebaseContext {
      * Analyze a single source file — extract symbols, imports, exports,
      * and compute complexity metrics.
      *
-     * When LanguageSupport is available and the file is not TS/JS,
-     * uses language-specific patterns for symbol extraction.
+     * For TypeScript/JavaScript files, first attempts AST-based extraction via AstAnalyzer
+     * (ts-morph) for improved accuracy, then merges/falls back to regex-based extraction.
+     * When LanguageSupport is available and the file is not TS/JS, uses language-specific
+     * patterns for symbol extraction.
      */
     private analyzeFile;
+    /**
+     * Try AST-based symbol extraction (ts-morph) for a TS/JS file.
+     * If AstAnalyzer returns results, merges them with regex results to fill in detail
+     * (params, jsdoc, etc.) not available from the AST layer alone.
+     * Falls back to pure regex extraction on any error or empty AST result.
+     */
+    private extractSymbolsWithAstFallback;
+    /**
+     * Merge AST symbol info (accurate line numbers, exported status) with regex symbol info
+     * (params, jsdoc, return types). AST results are authoritative for line/endLine/exported/isDefault.
+     * Symbols found by AST but not regex are included as minimal entries (no params/jsdoc).
+     * Symbols found by regex but not AST are included as-is (regex may have false positives
+     * for unexported symbols inside bodies, which is acceptable).
+     */
+    private mergeAstAndRegexSymbols;
     /**
      * Extract all symbol definitions from file content using regex patterns.
      */

package/dist/codebase-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codebase-context.d.ts","sourceRoot":"","sources":["../src/codebase-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codebase-context.d.ts","sourceRoot":"","sources":["../src/codebase-context.ts"],"names":[],"mappings":"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"}

package/dist/codebase-context.js

@@ -3,11 +3,13 @@
  * @description Codebase Context Engine — indexes TypeScript/JavaScript projects,
  * extracts symbols, builds call graphs, and provides semantic search + blast radius analysis.
  *
- * Uses regex-based AST analysis (no ts-morph dependency). Designed for the YUAN coding agent
- * to understand project structure before making changes.
+ * Uses regex-based parsing with an optional ts-morph AST layer for improved accuracy on
+ * TypeScript/JavaScript files (avoids false positives in comments/strings, correctly detects
+ * type-only imports). Falls back to regex when ts-morph is unavailable.
  */
 import { readdir, readFile } from "node:fs/promises";
 import { join, resolve, extname, relative } from "node:path";
+import { AstAnalyzer } from "./ast-analyzer.js";
 // ─── Constants ───
 const SOURCE_EXTENSIONS = new Set([".ts", ".tsx", ".js", ".jsx"]);
 const SKIP_DIRS = new Set([
@@ -69,9 +71,12 @@ export class CodebaseContext {
     reverseDepMap = new Map();
     /** Optional multi-language support for non-TS/JS files */
     languageSupport;
+    /** AST-based analyzer for accurate TS/JS analysis (ts-morph) */
+    astAnalyzer;
     constructor(projectPath, languageSupport) {
         this.projectPath = resolve(projectPath);
         this.languageSupport = languageSupport ?? null;
+        this.astAnalyzer = new AstAnalyzer(this.projectPath);
         this.index = {
             files: new Map(),
             symbolTable: new Map(),
@@ -100,7 +105,7 @@ export class CodebaseContext {
             try {
                 const content = await readFile(filePath, "utf-8");
                 this.fileContents.set(filePath, content);
-                const analysis = this.analyzeFile(filePath, content);
+                const analysis = await this.analyzeFile(filePath, content);
                 this.index.files.set(filePath, analysis);
             }
             catch {
@@ -128,7 +133,7 @@ export class CodebaseContext {
         try {
             const content = await readFile(absPath, "utf-8");
             this.fileContents.set(absPath, content);
-            const analysis = this.analyzeFile(absPath, content);
+            const analysis = await this.analyzeFile(absPath, content);
             this.index.files.set(absPath, analysis);
         }
         catch {
@@ -644,10 +649,12 @@ export class CodebaseContext {
      * Analyze a single source file — extract symbols, imports, exports,
      * and compute complexity metrics.
      *
-     * When LanguageSupport is available and the file is not TS/JS,
-     * uses language-specific patterns for symbol extraction.
+     * For TypeScript/JavaScript files, first attempts AST-based extraction via AstAnalyzer
+     * (ts-morph) for improved accuracy, then merges/falls back to regex-based extraction.
+     * When LanguageSupport is available and the file is not TS/JS, uses language-specific
+     * patterns for symbol extraction.
      */
-    analyzeFile(filePath, content) {
+    async analyzeFile(filePath, content) {
         const ext = extname(filePath);
         const isTsJs = ext === ".ts" || ext === ".tsx" || ext === ".js" || ext === ".jsx";
         // Detect language — use LanguageSupport when available, fallback to TS/JS
@@ -662,13 +669,13 @@ export class CodebaseContext {
             language = "javascript"; // shouldn't happen, but safe fallback
         }
         const lines = content.split("\n");
-        // For TS/JS files or when LanguageSupport is unavailable, use built-in extraction
-        // For other languages, use LanguageSupport patterns for basic symbol extraction
         let symbols;
         if (isTsJs || !this.languageSupport) {
-            symbols = this.extractSymbols(filePath, content, lines);
+            // For TS/JS: try AST-based extraction first for accuracy, fall back to regex
+            symbols = await this.extractSymbolsWithAstFallback(filePath, content, lines);
         }
         else {
+            // For other languages: use LanguageSupport patterns
             symbols = this.extractSymbolsWithLanguageSupport(filePath, content, lines, language);
         }
         const imports = this.extractImports(content);
@@ -677,6 +684,89 @@ export class CodebaseContext {
         const complexity = this.computeComplexity(content, lines, imports.length);
         return { file: filePath, language, symbols, imports, exports, callEdges, complexity };
     }
+    /**
+     * Try AST-based symbol extraction (ts-morph) for a TS/JS file.
+     * If AstAnalyzer returns results, merges them with regex results to fill in detail
+     * (params, jsdoc, etc.) not available from the AST layer alone.
+     * Falls back to pure regex extraction on any error or empty AST result.
+     */
+    async extractSymbolsWithAstFallback(filePath, content, lines) {
+        try {
+            const astSymbols = await this.astAnalyzer.extractSymbols(filePath);
+            if (astSymbols.length > 0) {
+                // AstAnalyzer succeeded — use regex extraction to get full detail (params, jsdoc…),
+                // but trust AST line numbers and exported status for the symbols it found.
+                const regexSymbols = this.extractSymbols(filePath, content, lines);
+                return this.mergeAstAndRegexSymbols(astSymbols, regexSymbols, filePath);
+            }
+        }
+        catch {
+            // AstAnalyzer failed — fall through to regex
+        }
+        return this.extractSymbols(filePath, content, lines);
+    }
+    /**
+     * Merge AST symbol info (accurate line numbers, exported status) with regex symbol info
+     * (params, jsdoc, return types). AST results are authoritative for line/endLine/exported/isDefault.
+     * Symbols found by AST but not regex are included as minimal entries (no params/jsdoc).
+     * Symbols found by regex but not AST are included as-is (regex may have false positives
+     * for unexported symbols inside bodies, which is acceptable).
+     */
+    mergeAstAndRegexSymbols(astSymbols, regexSymbols, filePath) {
+        const merged = [];
+        const regexByName = new Map();
+        for (const sym of regexSymbols) {
+            const arr = regexByName.get(sym.name) ?? [];
+            arr.push(sym);
+            regexByName.set(sym.name, arr);
+        }
+        const astNames = new Set();
+        for (const astSym of astSymbols) {
+            const displayName = astSym.isDefault && astSym.name === "__default__" ? "default" : astSym.name;
+            astNames.add(displayName);
+            // Find the best matching regex symbol (by name, pick closest line)
+            const candidates = regexByName.get(displayName) ?? [];
+            let best;
+            let bestLineDiff = Infinity;
+            for (const candidate of candidates) {
+                const diff = Math.abs(candidate.line - astSym.line);
+                if (diff < bestLineDiff) {
+                    bestLineDiff = diff;
+                    best = candidate;
+                }
+            }
+            if (best && bestLineDiff <= 5) {
+                // Merge: use AST accuracy for line/endLine/exported/isDefault, regex for the rest
+                merged.push({
+                    ...best,
+                    line: astSym.line,
+                    endLine: astSym.endLine,
+                    exported: true, // AST found it as exported declaration
+                    isDefault: astSym.isDefault,
+                });
+            }
+            else {
+                // AST found a symbol regex missed — include as a minimal entry
+                merged.push({
+                    name: displayName,
+                    kind: astSym.kind,
+                    file: filePath,
+                    line: astSym.line,
+                    endLine: astSym.endLine,
+                    exported: true,
+                    isDefault: astSym.isDefault,
+                    isAsync: false,
+                });
+            }
+        }
+        // Include regex-found symbols not covered by AST (unexported/internal — AST only returns exports)
+        for (const sym of regexSymbols) {
+            if (!astNames.has(sym.name)) {
+                merged.push(sym);
+            }
+        }
+        return merged;
+    }
     /**
      * Extract all symbol definitions from file content using regex patterns.
      */