@getmikk/core 1.8.2 → 1.9.0

package/src/parser/typescript/ts-extractor.ts

@@ -1,13 +1,20 @@
 import ts from 'typescript'
-import type { ParsedFunction, ParsedClass, ParsedImport, ParsedExport, ParsedParam, ParsedGeneric, ParsedRoute } from '../types.js'
+import type { 
+    ParsedFunction, 
+    ParsedClass, 
+    ParsedImport, 
+    ParsedExport, 
+    ParsedParam, 
+    ParsedGeneric, 
+    ParsedRoute,
+    ParsedVariable,
+    CallExpression
+} from '../types.js'
 import { hashContent } from '../../hash/file-hasher.js'
 
-/**
- * TypeScript AST extractor walks the TypeScript AST using the TS Compiler API
- * and extracts functions, classes, imports, exports and call relationships.
- */
 export class TypeScriptExtractor {
     protected readonly sourceFile: ts.SourceFile
+    private nameCounter = new Map<string, number>()
 
     constructor(
         protected readonly filePath: string,
@@ -17,12 +24,11 @@ export class TypeScriptExtractor {
             filePath,
             content,
             ts.ScriptTarget.Latest,
-            true, // setParentNodes
+            true,
             this.inferScriptKind(filePath)
         )
     }
 
-    /** Infer TypeScript ScriptKind from file extension (supports JS/JSX/TS/TSX) */
     private inferScriptKind(filePath: string): ts.ScriptKind {
         if (filePath.endsWith('.tsx')) return ts.ScriptKind.TSX
         if (filePath.endsWith('.jsx')) return ts.ScriptKind.JSX
@@ -30,23 +36,28 @@ export class TypeScriptExtractor {
         return ts.ScriptKind.TS
     }
 
-    /** Extract all top-level and variable-assigned functions */
+    private allocateId(prefix: string, name: string): string {
+        const count = (this.nameCounter.get(name) ?? 0) + 1
+        this.nameCounter.set(name, count)
+        const suffix = count === 1 ? '' : `#${count}`
+        const normalizedPath = this.filePath.replace(/\\/g, '/')
+        return `${prefix}:${normalizedPath}:${name}${suffix}`.toLowerCase()
+    }
+
+    resetCounters(): void {
+        this.nameCounter.clear()
+    }
+
     extractFunctions(): ParsedFunction[] {
         const functions: ParsedFunction[] = []
         this.walkNode(this.sourceFile, (node) => {
-            // function declarations: function foo() {}
             if (ts.isFunctionDeclaration(node) && node.name) {
                 functions.push(this.parseFunctionDeclaration(node))
             }
-            // variable declarations with arrow functions or function expressions:
-            // const foo = () => {} or const foo = function() {}
             if (ts.isVariableStatement(node)) {
                 for (const decl of node.declarationList.declarations) {
                     if (decl.initializer && ts.isIdentifier(decl.name)) {
-                        if (
-                            ts.isArrowFunction(decl.initializer) ||
-                            ts.isFunctionExpression(decl.initializer)
-                        ) {
+                        if (ts.isArrowFunction(decl.initializer) || ts.isFunctionExpression(decl.initializer)) {
                             functions.push(this.parseVariableFunction(node, decl, decl.initializer))
                         }
                     }
@@ -56,7 +67,6 @@ export class TypeScriptExtractor {
         return functions
     }
 
-    /** Extract all class declarations */
     extractClasses(): ParsedClass[] {
         const classes: ParsedClass[] = []
         this.walkNode(this.sourceFile, (node) => {
@@ -67,677 +77,371 @@ export class TypeScriptExtractor {
         return classes
     }
 
-    /** Extract generic declarations (interfaces, types, constants with metadata) */
+    extractVariables(): ParsedVariable[] {
+        const variables: ParsedVariable[] = []
+        this.walkNode(this.sourceFile, (node) => {
+            if (ts.isVariableStatement(node)) {
+                for (const decl of node.declarationList.declarations) {
+                    if (ts.isIdentifier(decl.name) && !this.isFunctionLike(decl.initializer)) {
+                        variables.push(this.parseVariable(node, decl))
+                    }
+                }
+            }
+        })
+        return variables
+    }
+
+    private isFunctionLike(node?: ts.Node): boolean {
+        return !!node && (ts.isArrowFunction(node) || ts.isFunctionExpression(node))
+    }
+
     extractGenerics(): ParsedGeneric[] {
         const generics: ParsedGeneric[] = []
         this.walkNode(this.sourceFile, (node) => {
             if (ts.isInterfaceDeclaration(node)) {
-                const tp = this.extractTypeParameters(node.typeParameters)
                 generics.push({
-                    id: `intf:${this.filePath}:${node.name.text}`,
+                    id: this.allocateId('intf', node.name.text),
                     name: node.name.text,
                     type: 'interface',
                     file: this.filePath,
-                    startLine: this.getLineNumber(node.getStart()),
+                    startLine: this.getLineNumber(node.getStart(this.sourceFile)),
                     endLine: this.getLineNumber(node.getEnd()),
                     isExported: this.hasExportModifier(node),
-                    ...(tp.length > 0 ? { typeParameters: tp } : {}),
+                    typeParameters: this.extractTypeParameters(node.typeParameters),
+                    hash: hashContent(node.getText(this.sourceFile)),
                     purpose: this.extractPurpose(node),
                 })
             } else if (ts.isTypeAliasDeclaration(node)) {
-                const tp = this.extractTypeParameters(node.typeParameters)
                 generics.push({
-                    id: `type:${this.filePath}:${node.name.text}`,
+                    id: this.allocateId('type', node.name.text),
                     name: node.name.text,
                     type: 'type',
                     file: this.filePath,
-                    startLine: this.getLineNumber(node.getStart()),
+                    startLine: this.getLineNumber(node.getStart(this.sourceFile)),
                     endLine: this.getLineNumber(node.getEnd()),
                     isExported: this.hasExportModifier(node),
-                    ...(tp.length > 0 ? { typeParameters: tp } : {}),
+                    typeParameters: this.extractTypeParameters(node.typeParameters),
+                    hash: hashContent(node.getText(this.sourceFile)),
                     purpose: this.extractPurpose(node),
                 })
-            } else if (ts.isVariableStatement(node) && !this.isVariableFunction(node)) {
-                // top-level constants (not functions)
-                for (const decl of node.declarationList.declarations) {
-                    if (ts.isIdentifier(decl.name)) {
-                        generics.push({
-                            id: `const:${this.filePath}:${decl.name.text}`,
-                            name: decl.name.text,
-                            type: 'const',
-                            file: this.filePath,
-                            startLine: this.getLineNumber(node.getStart()),
-                            endLine: this.getLineNumber(node.getEnd()),
-                            isExported: this.hasExportModifier(node),
-                            purpose: this.extractPurpose(node),
-                        })
-                    }
-                }
             }
         })
         return generics
     }
 
-    protected isVariableFunction(node: ts.VariableStatement): boolean {
-        for (const decl of node.declarationList.declarations) {
-            if (decl.initializer && (ts.isArrowFunction(decl.initializer) || ts.isFunctionExpression(decl.initializer))) {
-                return true
-            }
-        }
-        return false
-    }
-
-    /** Extract all import statements (static and dynamic) */
     extractImports(): ParsedImport[] {
         const imports: ParsedImport[] = []
         this.walkNode(this.sourceFile, (node) => {
             if (ts.isImportDeclaration(node)) {
+                if (node.importClause?.isTypeOnly) return;
                 const parsed = this.parseImport(node)
-                if (parsed) imports.push(parsed)
-            }
-        })
-
-        // Also detect dynamic import() calls: await import('./path')
-        const walkDynamic = (n: ts.Node) => {
-            if (ts.isCallExpression(n) && n.expression.kind === ts.SyntaxKind.ImportKeyword) {
-                const arg = n.arguments[0]
-                if (arg && ts.isStringLiteral(arg)) {
-                    imports.push({
-                        source: arg.text,
-                        resolvedPath: '', // Filled in by resolver
-                        names: [],
-                        isDefault: false,
-                        isDynamic: true,
-                    })
+                if (parsed) {
+                    // Filter out type-only named imports
+                    parsed.names = parsed.names.filter(n => !n.startsWith('type '))
+                    imports.push(parsed)
                 }
             }
-            ts.forEachChild(n, walkDynamic)
-        }
-        ts.forEachChild(this.sourceFile, walkDynamic)
-
+        })
         return imports
     }
 
-    /** Extract all exported symbols */
     extractExports(): ParsedExport[] {
         const exports: ParsedExport[] = []
         this.walkNode(this.sourceFile, (node) => {
-            // export function foo() {}
             if (ts.isFunctionDeclaration(node) && node.name && this.hasExportModifier(node)) {
-                exports.push({
-                    name: node.name.text,
-                    type: 'function',
-                    file: this.filePath,
-                })
+                exports.push({ name: node.name.text, type: 'function', file: this.filePath })
             }
-            // export class Foo {}
             if (ts.isClassDeclaration(node) && node.name && this.hasExportModifier(node)) {
-                exports.push({
-                    name: node.name.text,
-                    type: 'class',
-                    file: this.filePath,
-                })
+                exports.push({ name: node.name.text, type: 'class', file: this.filePath })
             }
-            // export const foo = ...
             if (ts.isVariableStatement(node) && this.hasExportModifier(node)) {
-                for (const decl of node.declarationList.declarations) {
+                node.declarationList.declarations.forEach(decl => {
                     if (ts.isIdentifier(decl.name)) {
-                        const type = decl.initializer &&
-                            (ts.isArrowFunction(decl.initializer) || ts.isFunctionExpression(decl.initializer))
-                            ? 'function' : 'const'
-                        exports.push({
-                            name: decl.name.text,
-                            type: type as ParsedExport['type'],
-                            file: this.filePath,
-                        })
+                        exports.push({ name: decl.name.text, type: 'const', file: this.filePath })
                     }
-                }
-            }
-            // export interface Foo {}
-            if (ts.isInterfaceDeclaration(node) && this.hasExportModifier(node)) {
-                exports.push({
-                    name: node.name.text,
-                    type: 'interface',
-                    file: this.filePath,
                 })
             }
-            // export type Foo = ...
-            if (ts.isTypeAliasDeclaration(node) && this.hasExportModifier(node)) {
-                exports.push({
-                    name: node.name.text,
-                    type: 'type',
-                    file: this.filePath,
-                })
-            }
-            // export default ...
             if (ts.isExportAssignment(node)) {
-                const name = node.expression && ts.isIdentifier(node.expression) ? node.expression.text : 'default'
-                exports.push({
-                    name,
-                    type: 'default',
-                    file: this.filePath,
-                })
-            }
-            // export { foo, bar } from './module'
-            if (ts.isExportDeclaration(node) && node.exportClause && ts.isNamedExports(node.exportClause)) {
-                for (const element of node.exportClause.elements) {
-                    exports.push({
-                        name: element.name.text,
-                        type: 'const',
-                        file: this.filePath,
-                    })
-                }
+                exports.push({ name: 'default', type: 'default', file: this.filePath })
             }
         })
         return exports
     }
 
-    /**
-     * Extract HTTP route registrations.
-     * Detects Express/Koa/Hono patterns like:
-     *   router.get("/path", handler)
-     *   app.post("/path", middleware, handler)
-     *   app.use("/prefix", subrouter)
-     *   router.use(middleware)
-     */
     extractRoutes(): ParsedRoute[] {
         const routes: ParsedRoute[] = []
-        const HTTP_METHODS = new Set(['get', 'post', 'put', 'delete', 'patch', 'head', 'options', 'all', 'use'])
-        // Only detect routes on receiver objects that look like routers/apps
-        const ROUTER_NAMES = new Set(['app', 'router', 'server', 'route', 'api', 'express'])
-
-        const walk = (node: ts.Node) => {
-            if (
-                ts.isCallExpression(node) &&
-                ts.isPropertyAccessExpression(node.expression)
-            ) {
-                const methodName = node.expression.name.text.toLowerCase()
-                if (HTTP_METHODS.has(methodName)) {
-                    // Check if the receiver is a known router/app-like identifier
-                    const receiver = node.expression.expression
-                    let receiverName = ''
-                    if (ts.isIdentifier(receiver)) {
-                        receiverName = receiver.text.toLowerCase()
-                    } else if (ts.isPropertyAccessExpression(receiver) && ts.isIdentifier(receiver.expression)) {
-                        receiverName = receiver.expression.text.toLowerCase()
-                    }
-
-                    // Skip if receiver doesn't look like a router (e.g. prisma.file.delete)
-                    if (!ROUTER_NAMES.has(receiverName)) {
-                        ts.forEachChild(node, walk)
-                        return
-                    }
-
-                    const args = node.arguments
-                    let routePath = ''
-                    const middlewares: string[] = []
-                    let handler = 'anonymous'
-
-                    for (let i = 0; i < args.length; i++) {
-                        const arg = args[i]
-                        // First string literal is the route path
-                        if (ts.isStringLiteral(arg) && !routePath) {
-                            routePath = arg.text
-                        } else if (ts.isIdentifier(arg)) {
-                            // Last identifier is the handler; earlier ones are middleware
-                            if (i === args.length - 1) {
-                                handler = arg.text
-                            } else {
-                                middlewares.push(arg.text)
-                            }
-                        } else if (ts.isCallExpression(arg)) {
-                            // e.g. upload.single("file") middleware call
-                            middlewares.push(arg.expression.getText(this.sourceFile))
-                        } else if (ts.isArrowFunction(arg) || ts.isFunctionExpression(arg)) {
-                            handler = 'anonymous'
-                        }
+        this.walkNode(this.sourceFile, (node) => {
+            if (ts.isCallExpression(node)) {
+                const text = node.expression.getText(this.sourceFile)
+                if (text.match(/^(router|app|express)\.(get|post|put|delete|patch)$/)) {
+                    const method = text.split('.')[1].toUpperCase() as any
+                    const pathArg = node.arguments[0]
+                    if (pathArg && ts.isStringLiteral(pathArg)) {
+                        const path = pathArg.text
+                        const handler = node.arguments[node.arguments.length - 1]
+                        const middlewares = node.arguments.slice(1, -1).map(a => a.getText(this.sourceFile))
+                        routes.push({
+                            method,
+                            path,
+                            handler: handler.getText(this.sourceFile),
+                            middlewares,
+                            file: this.filePath,
+                            line: this.getLineNumber(node.getStart(this.sourceFile))
+                        })
                     }
-
-                    routes.push({
-                        method: methodName.toUpperCase(),
-                        path: routePath || '*',
-                        handler,
-                        middlewares,
-                        file: this.filePath,
-                        line: this.getLineNumber(node.getStart()),
-                    })
                 }
             }
-            ts.forEachChild(node, walk)
-        }
-        ts.forEachChild(this.sourceFile, walk)
+        })
         return routes
     }
 
-    // Protected Helpers ------------------------------------------------------
+    extractModuleCalls(): CallExpression[] {
+        // Calls occurring at the top level of the file
+        const calls: CallExpression[] = []
+        this.sourceFile.statements.forEach(stmt => {
+            if (!ts.isFunctionDeclaration(stmt) && !ts.isClassDeclaration(stmt)) {
+                calls.push(...this.extractCallsFromNode(stmt))
+            }
+        })
+        return calls
+    }
+
+    // --- Private Parsers ---
 
-    protected parseFunctionDeclaration(node: ts.FunctionDeclaration): ParsedFunction {
+    private parseFunctionDeclaration(node: ts.FunctionDeclaration): ParsedFunction {
         const name = node.name!.text
-        const startLine = this.getLineNumber(node.getStart())
-        const endLine = this.getLineNumber(node.getEnd())
-        const params = this.extractParams(node.parameters)
-        const returnType = normalizeTypeAnnotation(node.type ? node.type.getText(this.sourceFile) : 'void')
-        const isAsync = !!node.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)
-        const isGenerator = !!node.asteriskToken
-        const typeParameters = this.extractTypeParameters(node.typeParameters)
-        const calls = this.extractCalls(node)
         const bodyText = node.getText(this.sourceFile)
-
         return {
-            // Include startLine in the ID to prevent collision between overload signatures
-            // and same-named functions in different scopes (e.g. two `init` declarations).
-            id: `fn:${this.filePath}:${name}:${startLine}`,
+            id: this.allocateId('fn', name),
             name,
             file: this.filePath,
-            startLine,
-            endLine,
-            params,
-            returnType,
+            startLine: this.getLineNumber(node.getStart(this.sourceFile)),
+            endLine: this.getLineNumber(node.getEnd()),
+            params: this.extractParams(node.parameters),
+            returnType: node.type ? node.type.getText(this.sourceFile) : 'void',
             isExported: this.hasExportModifier(node),
-            isAsync,
-            ...(isGenerator ? { isGenerator } : {}),
-            ...(typeParameters.length > 0 ? { typeParameters } : {}),
-            calls,
+            isAsync: !!node.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword),
+            calls: this.extractCallsFromNode(node),
             hash: hashContent(bodyText),
             purpose: this.extractPurpose(node),
             edgeCasesHandled: this.extractEdgeCases(node),
             errorHandling: this.extractErrorHandling(node),
-            detailedLines: this.extractDetailedLines(node),
+            detailedLines: [],
         }
     }
 
-    protected parseVariableFunction(
-        stmt: ts.VariableStatement,
-        decl: ts.VariableDeclaration,
-        fn: ts.ArrowFunction | ts.FunctionExpression
-    ): ParsedFunction {
+    private parseVariableFunction(stmt: ts.VariableStatement, decl: ts.VariableDeclaration, fn: ts.ArrowFunction | ts.FunctionExpression): ParsedFunction {
         const name = (decl.name as ts.Identifier).text
-        const startLine = this.getLineNumber(stmt.getStart())
-        const endLine = this.getLineNumber(stmt.getEnd())
-        const params = this.extractParams(fn.parameters)
-        const returnType = normalizeTypeAnnotation(fn.type ? fn.type.getText(this.sourceFile) : 'void')
-        const isAsync = !!fn.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)
-        const isGenerator = ts.isFunctionExpression(fn) && !!fn.asteriskToken
-        const typeParameters = this.extractTypeParameters(fn.typeParameters)
-        const calls = this.extractCalls(fn)
         const bodyText = stmt.getText(this.sourceFile)
-
         return {
-            // Include startLine to prevent collision between same-named const arrow functions
-            // at different scopes (e.g. two `handler` declarations in different blocks).
-            id: `fn:${this.filePath}:${name}:${startLine}`,
+            id: this.allocateId('fn', name),
             name,
             file: this.filePath,
-            startLine,
-            endLine,
-            params,
-            returnType,
+            startLine: this.getLineNumber(stmt.getStart(this.sourceFile)),
+            endLine: this.getLineNumber(stmt.getEnd()),
+            params: this.extractParams(fn.parameters),
+            returnType: fn.type ? fn.type.getText(this.sourceFile) : 'unknown',
             isExported: this.hasExportModifier(stmt),
-            isAsync,
-            ...(isGenerator ? { isGenerator } : {}),
-            ...(typeParameters.length > 0 ? { typeParameters } : {}),
-            calls,
+            isAsync: !!fn.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword),
+            calls: this.extractCallsFromNode(fn),
             hash: hashContent(bodyText),
             purpose: this.extractPurpose(stmt),
             edgeCasesHandled: this.extractEdgeCases(fn),
             errorHandling: this.extractErrorHandling(fn),
-            detailedLines: this.extractDetailedLines(fn),
+            detailedLines: [],
         }
     }
 
-    protected parseClass(node: ts.ClassDeclaration): ParsedClass {
+    private parseClass(node: ts.ClassDeclaration): ParsedClass {
         const name = node.name!.text
-        const startLine = this.getLineNumber(node.getStart())
-        const endLine = this.getLineNumber(node.getEnd())
         const methods: ParsedFunction[] = []
-        const decorators = this.extractDecorators(node)
-        const typeParameters = this.extractTypeParameters(node.typeParameters)
+        const properties: ParsedVariable[] = []
 
         for (const member of node.members) {
-            if (ts.isConstructorDeclaration(member)) {
-                // Track class constructors as methods
-                const mStartLine = this.getLineNumber(member.getStart())
-                const mEndLine = this.getLineNumber(member.getEnd())
-                const params = this.extractParams(member.parameters)
-                const calls = this.extractCalls(member)
-                const bodyText = member.getText(this.sourceFile)
-
-                methods.push({
-                    id: `fn:${this.filePath}:${name}.constructor:${mStartLine}`,
-                    name: `${name}.constructor`,
-                    file: this.filePath,
-                    startLine: mStartLine,
-                    endLine: mEndLine,
-                    params,
-                    returnType: name,
-                    isExported: this.hasExportModifier(node),
-                    isAsync: false,
-                    calls,
-                    hash: hashContent(bodyText),
-                    purpose: this.extractPurpose(member),
-                    edgeCasesHandled: this.extractEdgeCases(member),
-                    errorHandling: this.extractErrorHandling(member),
-                    detailedLines: this.extractDetailedLines(member),
-                })
-            } else if (ts.isMethodDeclaration(member) && member.name) {
-                const methodName = member.name.getText(this.sourceFile)
-                const mStartLine = this.getLineNumber(member.getStart())
-                const mEndLine = this.getLineNumber(member.getEnd())
-                const params = this.extractParams(member.parameters)
-                const returnType = normalizeTypeAnnotation(member.type ? member.type.getText(this.sourceFile) : 'void')
-                const isAsync = !!member.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)
-                const isGenerator = !!member.asteriskToken
-                const methodTypeParams = this.extractTypeParameters(member.typeParameters)
-                const calls = this.extractCalls(member)
-                const bodyText = member.getText(this.sourceFile)
-
-                methods.push({
-                    id: `fn:${this.filePath}:${name}.${methodName}:${mStartLine}`,
-                    name: `${name}.${methodName}`,
-                    file: this.filePath,
-                    startLine: mStartLine,
-                    endLine: mEndLine,
-                    params,
-                    returnType,
-                    isExported: this.hasExportModifier(node),
-                    isAsync,
-                    ...(isGenerator ? { isGenerator } : {}),
-                    ...(methodTypeParams.length > 0 ? { typeParameters: methodTypeParams } : {}),
-                    calls,
-                    hash: hashContent(bodyText),
-                    purpose: this.extractPurpose(member),
-                    edgeCasesHandled: this.extractEdgeCases(member),
-                    errorHandling: this.extractErrorHandling(member),
-                    detailedLines: this.extractDetailedLines(member),
-                })
+            if (ts.isMethodDeclaration(member) && member.name) {
+                methods.push(this.parseMethod(name, member))
+            } else if (ts.isPropertyDeclaration(member) && member.name) {
+                properties.push(this.parseProperty(name, member))
             }
         }
 
         return {
-            id: `class:${this.filePath}:${name}`,
+            id: this.allocateId('class', name),
             name,
             file: this.filePath,
-            startLine,
-            endLine,
+            startLine: this.getLineNumber(node.getStart(this.sourceFile)),
+            endLine: this.getLineNumber(node.getEnd()),
             methods,
+            properties,
+            extends: node.heritageClauses?.find(c => c.token === ts.SyntaxKind.ExtendsKeyword)?.types[0]?.getText(this.sourceFile),
+            implements: node.heritageClauses?.find(c => c.token === ts.SyntaxKind.ImplementsKeyword)?.types.map(t => t.getText(this.sourceFile)),
             isExported: this.hasExportModifier(node),
-            ...(decorators.length > 0 ? { decorators } : {}),
-            ...(typeParameters.length > 0 ? { typeParameters } : {}),
+            hash: hashContent(node.getText(this.sourceFile)),
+            purpose: this.extractPurpose(node),
+            edgeCasesHandled: this.extractEdgeCases(node),
+            errorHandling: this.extractErrorHandling(node),
+        }
+    }
+
+    private parseMethod(className: string, node: ts.MethodDeclaration): ParsedFunction {
+        const methodName = node.name.getText(this.sourceFile)
+        const fullName = `${className}.${methodName}`
+        return {
+            id: this.allocateId('fn', fullName),
+            name: fullName,
+            file: this.filePath,
+            startLine: this.getLineNumber(node.getStart(this.sourceFile)),
+            endLine: this.getLineNumber(node.getEnd()),
+            params: this.extractParams(node.parameters),
+            returnType: node.type ? node.type.getText(this.sourceFile) : 'void',
+            isExported: false,
+            isAsync: !!node.modifiers?.some(m => m.kind === ts.SyntaxKind.AsyncKeyword),
+            calls: this.extractCallsFromNode(node),
+            hash: hashContent(node.getText(this.sourceFile)),
             purpose: this.extractPurpose(node),
             edgeCasesHandled: this.extractEdgeCases(node),
             errorHandling: this.extractErrorHandling(node),
+            detailedLines: [],
         }
     }
 
-    protected parseImport(node: ts.ImportDeclaration): ParsedImport | null {
+    private parseProperty(className: string, node: ts.PropertyDeclaration): ParsedVariable {
+        const propName = node.name.getText(this.sourceFile)
+        return {
+            id: this.allocateId('var', `${className}.${propName}`),
+            name: propName,
+            type: node.type ? node.type.getText(this.sourceFile) : 'any',
+            file: this.filePath,
+            line: this.getLineNumber(node.getStart(this.sourceFile)),
+            isExported: false,
+            isStatic: !!node.modifiers?.some(m => m.kind === ts.SyntaxKind.StaticKeyword),
+        }
+    }
+
+    private parseVariable(stmt: ts.VariableStatement, decl: ts.VariableDeclaration): ParsedVariable {
+        const name = (decl.name as ts.Identifier).text
+        return {
+            id: this.allocateId('var', name),
+            name,
+            type: decl.type ? decl.type.getText(this.sourceFile) : 'any',
+            file: this.filePath,
+            line: this.getLineNumber(stmt.getStart(this.sourceFile)),
+            isExported: this.hasExportModifier(stmt),
+        }
+    }
+
+    private parseImport(node: ts.ImportDeclaration): ParsedImport {
         const source = (node.moduleSpecifier as ts.StringLiteral).text
         const names: string[] = []
         let isDefault = false
-
         if (node.importClause) {
-            // import Foo from './module' (default import)
             if (node.importClause.name) {
                 names.push(node.importClause.name.text)
                 isDefault = true
             }
-            // import { foo, bar } from './module'
-            if (node.importClause.namedBindings) {
-                if (ts.isNamedImports(node.importClause.namedBindings)) {
-                    for (const element of node.importClause.namedBindings.elements) {
-                        names.push(element.name.text)
-                    }
-                }
-                // import * as foo from './module'
-                if (ts.isNamespaceImport(node.importClause.namedBindings)) {
-                    names.push(node.importClause.namedBindings.name.text)
-                }
+            if (node.importClause.namedBindings && ts.isNamedImports(node.importClause.namedBindings)) {
+                node.importClause.namedBindings.elements.forEach(el => names.push(el.name.text))
             }
         }
-
-        // Skip type-only imports
-        if (node.importClause?.isTypeOnly) return null
-
-        return {
-            source,
-            resolvedPath: '', // Filled in by resolver
-            names,
-            isDefault,
-            isDynamic: false,
-        }
+        return { source, resolvedPath: '', names, isDefault, isDynamic: false }
     }
 
-    /** Extract function/method call expressions from a node (including new Foo()) */
-    protected extractCalls(node: ts.Node): string[] {
-        const calls: string[] = []
-        const walkCalls = (n: ts.Node) => {
+    // --- Helpers ---
+
+    protected extractCallsFromNode(node: ts.Node): CallExpression[] {
+        const calls: CallExpression[] = []
+        const walk = (n: ts.Node) => {
             if (ts.isCallExpression(n)) {
-                const callee = n.expression
-                if (ts.isIdentifier(callee)) {
-                    calls.push(callee.text)
-                } else if (ts.isPropertyAccessExpression(callee)) {
-                    // e.g., obj.method() we capture the full dotted name
-                    calls.push(callee.getText(this.sourceFile))
-                }
-            }
-            // Track constructor calls: new Foo(...) -> "Foo"
-            if (ts.isNewExpression(n)) {
-                const callee = n.expression
-                if (ts.isIdentifier(callee)) {
-                    calls.push(callee.text)
-                } else if (ts.isPropertyAccessExpression(callee)) {
-                    calls.push(callee.getText(this.sourceFile))
-                }
+                calls.push({
+                    name: n.expression.getText(this.sourceFile),
+                    line: this.getLineNumber(n.getStart(this.sourceFile)),
+                    type: ts.isPropertyAccessExpression(n.expression) ? 'method' : 'function'
+                })
+            } else if (ts.isNewExpression(n)) {
+                calls.push({
+                    name: n.expression.getText(this.sourceFile),
+                    line: this.getLineNumber(n.getStart(this.sourceFile)),
+                    type: 'function'
+                })
+            } else if (ts.isPropertyAccessExpression(n) && !ts.isCallExpression(n.parent)) {
+                 // Property access that isn't a call
+                 calls.push({
+                    name: n.getText(this.sourceFile),
+                    line: this.getLineNumber(n.getStart(this.sourceFile)),
+                    type: 'property'
+                 })
             }
-            ts.forEachChild(n, walkCalls)
+            ts.forEachChild(n, walk)
         }
-        ts.forEachChild(node, walkCalls)
-        return [...new Set(calls)] // deduplicate
+        walk(node)
+        return calls
     }
 
-    /** Extract the purpose from JSDoc comments or preceding single-line comments.
-     *  Falls back to deriving a human-readable sentence from the function name. */
-    protected extractPurpose(node: ts.Node): string {
-        const fullText = this.sourceFile.getFullText()
-        const commentRanges = ts.getLeadingCommentRanges(fullText, node.getFullStart())
-        if (commentRanges && commentRanges.length > 0) {
-            const meaningfulLines: string[] = []
-            for (const range of commentRanges) {
-                const comment = fullText.slice(range.pos, range.end)
-                let clean = ''
-                if (comment.startsWith('/**') || comment.startsWith('/*')) {
-                    // Strip only the comment delimiters (/* ** */) NOT arbitrary slashes.
-                    // Using /[\/\*]/g was wrong — it removes slashes inside URL paths and
-                    // regex literals embedded in doc comments (e.g. "/api/users" → "apiusers").
-                    clean = comment
-                        .replace(/^\/\*+/, '')   // remove leading /*  or /**
-                        .replace(/\*+\/$/, '')   // remove trailing */
-                        .replace(/^\s*\*+\s?/gm, '') // remove leading * on each line
-                        .trim()
-                } else if (comment.startsWith('//')) {
-                    clean = comment.replace(/^\/\/+\s?/, '').trim()
-                }
-
-                // Skip divider lines (lines with 3+ repeated special characters)
-                if (/^[\-_=\*]{3,}$/.test(clean)) continue
+    protected extractParams(params: ts.NodeArray<ts.ParameterDeclaration>): ParsedParam[] {
+        return params.map(p => ({
+            name: p.name.getText(this.sourceFile),
+            type: p.type ? p.type.getText(this.sourceFile) : 'any',
+            optional: !!p.questionToken || !!p.initializer,
+            defaultValue: p.initializer ? p.initializer.getText(this.sourceFile) : undefined,
+        }))
+    }
 
-                if (clean) meaningfulLines.push(clean)
-            }
+    protected extractTypeParameters(typeParams?: ts.NodeArray<ts.TypeParameterDeclaration>): string[] {
+        return typeParams?.map(t => t.name.text) || []
+    }
 
-            // Return the first meaningful line in JSDoc, the first line is the summary.
-            const fromComment = meaningfulLines.length > 0 ? meaningfulLines[0].split('\n')[0].trim() : ''
-            if (fromComment) return fromComment
-        }
+    protected hasExportModifier(node: ts.Node): boolean {
+        return !!ts.getModifiers(node as any)?.some(m => m.kind === ts.SyntaxKind.ExportKeyword)
+    }
 
-        // Fallback: derive a human-readable sentence from the function/identifier name
-        const name = this.getNodeName(node)
-        return name ? derivePurposeFromName(name) : ''
+    protected getLineNumber(pos: number): number {
+        return this.sourceFile.getLineAndCharacterOfPosition(pos).line + 1
     }
 
-    /** Get the identifier name from common declaration node types */
-    protected getNodeName(node: ts.Node): string {
-        if (ts.isFunctionDeclaration(node) && node.name) return node.name.text
-        if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
-            const parent = node.parent
-            if (parent && ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)) {
-                return parent.name.text
-            }
-        }
-        if (ts.isMethodDeclaration(node) && ts.isIdentifier(node.name)) return node.name.text
-        if (ts.isConstructorDeclaration(node)) return 'constructor'
-        if ((ts.isInterfaceDeclaration(node) || ts.isTypeAliasDeclaration(node) || ts.isClassDeclaration(node)) && node.name) {
-            return (node as any).name.text
+    protected extractPurpose(node: ts.Node): string {
+        const fullText = this.sourceFile.getFullText()
+        const ranges = ts.getLeadingCommentRanges(fullText, node.pos)
+        if (ranges && ranges.length > 0) {
+            const lastComment = fullText.slice(ranges[ranges.length - 1].pos, ranges[ranges.length - 1].end)
+            return lastComment.replace(/\/\*+|\*+\/|\/\/+/g, '').trim()
         }
         return ''
     }
 
-    /** Extract edge cases handled (if statements returning early) */
     protected extractEdgeCases(node: ts.Node): string[] {
         const edgeCases: string[] = []
-        const walkEdgeCases = (n: ts.Node) => {
-            if (ts.isIfStatement(n)) {
-                // simple heuristic for early returns inside if blocks
-                if (
-                    ts.isReturnStatement(n.thenStatement) ||
-                    (ts.isBlock(n.thenStatement) && n.thenStatement.statements.some(ts.isReturnStatement)) ||
-                    ts.isThrowStatement(n.thenStatement) ||
-                    (ts.isBlock(n.thenStatement) && n.thenStatement.statements.some(ts.isThrowStatement))
-                ) {
-                    edgeCases.push(n.expression.getText(this.sourceFile))
-                }
+        const walk = (n: ts.Node) => {
+            if (ts.isIfStatement(n) || ts.isConditionalExpression(n)) {
+                edgeCases.push(n.getText(this.sourceFile).split('{')[0].trim())
             }
-            ts.forEachChild(n, walkEdgeCases)
+            ts.forEachChild(n, walk)
         }
-        ts.forEachChild(node, walkEdgeCases)
+        walk(node)
         return edgeCases
     }
 
-    /** Extract try-catch blocks or explicit throw statements */
     protected extractErrorHandling(node: ts.Node): { line: number, type: 'try-catch' | 'throw', detail: string }[] {
-        const errors: { line: number, type: 'try-catch' | 'throw', detail: string }[] = []
-        const walkErrors = (n: ts.Node) => {
+        const result: { line: number, type: 'try-catch' | 'throw', detail: string }[] = []
+        const walk = (n: ts.Node) => {
             if (ts.isTryStatement(n)) {
-                errors.push({
-                    line: this.getLineNumber(n.getStart()),
-                    type: 'try-catch',
-                    detail: 'try-catch block'
-                })
+                result.push({ line: this.getLineNumber(n.getStart(this.sourceFile)), type: 'try-catch', detail: 'try block' })
+            } else if (ts.isThrowStatement(n)) {
+                result.push({ line: this.getLineNumber(n.getStart(this.sourceFile)), type: 'throw', detail: n.expression?.getText(this.sourceFile) || 'unknown' })
             }
-            if (ts.isThrowStatement(n)) {
-                errors.push({
-                    line: this.getLineNumber(n.getStart()),
-                    type: 'throw',
-                    detail: n.expression ? n.expression.getText(this.sourceFile) : 'throw error'
-                })
-            }
-            ts.forEachChild(n, walkErrors)
-        }
-        ts.forEachChild(node, walkErrors)
-        return errors
-    }
-
-    /** Extract detailed line block breakdowns */
-    protected extractDetailedLines(node: ts.Node): { startLine: number, endLine: number, blockType: string }[] {
-        const blocks: { startLine: number, endLine: number, blockType: string }[] = []
-        const walkBlocks = (n: ts.Node) => {
-            if (ts.isIfStatement(n) || ts.isSwitchStatement(n)) {
-                blocks.push({
-                    startLine: this.getLineNumber(n.getStart()),
-                    endLine: this.getLineNumber(n.getEnd()),
-                    blockType: 'ControlFlow'
-                })
-            } else if (ts.isForStatement(n) || ts.isWhileStatement(n) || ts.isForOfStatement(n) || ts.isForInStatement(n)) {
-                blocks.push({
-                    startLine: this.getLineNumber(n.getStart()),
-                    endLine: this.getLineNumber(n.getEnd()),
-                    blockType: 'Loop'
-                })
-            } else if (ts.isVariableStatement(n) || ts.isExpressionStatement(n)) {
-                // Ignore single lines for brevity unless part of larger logical units
-            }
-            ts.forEachChild(n, walkBlocks)
+            ts.forEachChild(n, walk)
         }
-        ts.forEachChild(node, walkBlocks)
-        return blocks
+        walk(node)
+        return result
     }
 
-    /** Extract type parameter names from a generic declaration */
-    protected extractTypeParameters(typeParams: ts.NodeArray<ts.TypeParameterDeclaration> | undefined): string[] {
-        if (!typeParams || typeParams.length === 0) return []
-        return typeParams.map(tp => tp.name.text)
+    protected extractDetailedLines(node: ts.Node): { startLine: number; endLine: number; blockType: string }[] {
+        return [] // Implementation for behavioral tracking
     }
 
-    /** Extract decorator names from a class declaration */
-    protected extractDecorators(node: ts.ClassDeclaration): string[] {
-        const decorators: string[] = []
-        const modifiers = ts.canHaveDecorators(node) ? ts.getDecorators(node) : undefined
-        if (modifiers) {
-            for (const decorator of modifiers) {
-                if (ts.isCallExpression(decorator.expression)) {
-                    // @Injectable() decorator with arguments
-                    decorators.push(decorator.expression.expression.getText(this.sourceFile))
-                } else if (ts.isIdentifier(decorator.expression)) {
-                    // @Sealed decorator without arguments
-                    decorators.push(decorator.expression.text)
-                }
-            }
-        }
-        return decorators
-    }
-
-    /** Extract parameters from a function's parameter list */
-    protected extractParams(params: ts.NodeArray<ts.ParameterDeclaration>): ParsedParam[] {
-        return params.map((p) => ({
-            name: p.name.getText(this.sourceFile),
-            type: normalizeTypeAnnotation(p.type ? p.type.getText(this.sourceFile) : 'any'),
-            optional: !!p.questionToken || !!p.initializer,
-            defaultValue: p.initializer ? p.initializer.getText(this.sourceFile) : undefined,
-        }))
-    }
-
-    /** Check if a node has the 'export' modifier */
-    protected hasExportModifier(node: ts.Node): boolean {
-        const modifiers = ts.canHaveModifiers(node) ? ts.getModifiers(node) : undefined
-        return !!modifiers?.some(m => m.kind === ts.SyntaxKind.ExportKeyword)
-    }
-
-    /** Get 1-indexed line number from a character position */
-    protected getLineNumber(pos: number): number {
-        return this.sourceFile.getLineAndCharacterOfPosition(pos).line + 1
-    }
-
-    /** Walk the top-level children of a node (non-recursive callbacks decide depth) */
-    protected walkNode(node: ts.Node, callback: (node: ts.Node) => void): void {
+    private walkNode(node: ts.Node, callback: (node: ts.Node) => void): void {
         ts.forEachChild(node, (child) => {
             callback(child)
+            this.walkNode(child, callback)
         })
     }
 }
-
-// 
-
-/**
- * Derive a human-readable purpose sentence from a camelCase/PascalCase identifier.
- * Examples:
- *   validateJwtToken   -> "Validate jwt token"
- *   buildGraphFromLock -> "Build graph from lock"
- *   UserRepository     -> "User repository"
- *   parseFiles         -> "Parse files"
- */
-function normalizeTypeAnnotation(type: string): string {
-    return type.replace(/\s*\n\s*/g, ' ').replace(/\s{2,}/g, ' ').trim()
-}
-
-function derivePurposeFromName(name: string): string {
-    if (!name || name === 'constructor') return ''
-    // Split on camelCase/PascalCase boundaries and underscores
-    const words = name
-        .replace(/_+/g, ' ')
-        .replace(/([a-z])([A-Z])/g, '$1 $2')
-        .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
-        .toLowerCase()
-        .split(/\s+/)
-        .filter(Boolean)
-    if (words.length === 0) return ''
-    words[0] = words[0].charAt(0).toUpperCase() + words[0].slice(1)
-    return words.join(' ')
-}