code-graph-llm 1.4.1 → 1.5.0

package/index.js

@@ -11,22 +11,25 @@ const __dirname = path.dirname(__filename);
 
 const IGNORE_FILE = '.gitignore';
 const DEFAULT_MAP_FILE = 'llm-code-graph.md';
-
 const SYMBOL_REGEXES = [
   // Types, Classes, Interfaces (Universal) with Inheritance support
-  // Captures: class Name extends Parent, interface Name implements Base
-  /\b(?:class|interface|type|struct|enum|protocol|extension|trait|module|namespace|object)\s+([a-zA-Z_]\w*)(?:\s+(?:extends|implements|:)\s+([a-zA-Z_]\w*(?:\s*,\s*[a-zA-Z_]\w*)*))?/g,
-  
+  /\b(?:class|interface|type|struct|enum|protocol|extension|trait|module|namespace|object)\s+([a-zA-Z_]\w*)(?:[^\n\S]*(?:extends|implements|:|(?:\())[^\n\S]*([a-zA-Z_]\w*(?:[^\n\S]*,\s*[a-zA-Z_]\w*)*)\)?)?/g,
+
   // Explicit Function Keywords
   /\b(?:function|def|fn|func|fun|method|procedure|sub|routine)\s+([a-zA-Z_]\w*)/g,
-  
-  // Method/Var Declarations (C-style, Java, C#, TS, Dart)
-  /\b(?:void|async|public|private|protected|static|virtual|override|readonly|int|float|double|char|bool|string|val|var|let|final)\s+([a-zA-Z_]\w*)(?=\s*(?:\([^)]*\)|[a-zA-Z_]\w*)\s*(?:\{|=>|;|=))/g,
-  
+
+  // Method/Var Declarations (Java, Spring Boot, C-style)
+  // Captures: public String askAi(String question), void realFunction()
+  /\b(?:void|async|public|private|protected|static|final|native|synchronized|abstract|transient|volatile)\s+(?:[\w<>[\]]+\s+)?([a-zA-Z_]\w*)(?=\s*\([^)]*\)\s*(?:\{|=>|;|=))/g,
+
+  // Spring/Java/Dart Annotations (Captures the annotation name as a prefix)
+  /(@[a-zA-Z_]\w*(?:\([^)]*\))?)\s*(?:(?:public|private|protected|static|final|abstract|class|interface|enum|void|[\w<>[\]]+)\s+)+([a-zA-Z_]\w*)/g,
+
   // Exported symbols
   /\bexport\s+(?:default\s+)?(?:const|let|var|function|class|type|interface|enum|async|val)\s+([a-zA-Z_]\w*)/g
 ];
 
+
 const EDGE_REGEXES = [
   // Imports/Includes (JS, TS, Python, Go, Rust, C++, Java, Dart)
   /\b(?:import|from|include|require|using)\s*(?:[\(\s])\s*['"]?([@\w\.\/\-]+)['"]?/g,
@@ -59,19 +62,30 @@ export function extractSymbolsAndInheritance(content) {
   const symbols = [];
   const inheritance = [];
   
-  // Create a version of content without comments to find symbols accurately
-  const noComments = content.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '');
+  // Create a version of content without comments AND strings to find symbols accurately
+  const cleanContent = content
+    .replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '')
+    .replace(/['"`](?:\\.|[^'"`])*['"`]/g, '');
 
   for (const regex of SYMBOL_REGEXES) {
     let match;
     regex.lastIndex = 0;
-    while ((match = regex.exec(noComments)) !== null) {
+    while ((match = regex.exec(cleanContent)) !== null) {
       if (match[1]) {
-        const symbolName = match[1];
-        if (['if', 'for', 'while', 'switch', 'return', 'await', 'yield', 'const', 'new', 'let', 'var'].includes(symbolName)) continue;
+        // Handle the Annotation regex separately (it has 2 groups)
+        let symbolName = match[1];
+        let annotation = '';
+        
+        if (symbolName.startsWith('@')) {
+          annotation = symbolName;
+          symbolName = match[2] || '';
+          if (!symbolName) continue;
+        }
+
+        if (['if', 'for', 'while', 'switch', 'return', 'await', 'yield', 'const', 'new', 'let', 'var', 'class', 'void', 'public', 'private', 'protected'].includes(symbolName)) continue;
 
-        // Capture inheritance if present (match[2])
-        if (match[2]) {
+        // Capture inheritance if present (match[2] only for non-annotation regex)
+        if (!annotation && match[2]) {
           const parents = match[2].split(',').map(p => p.trim());
           parents.forEach(parent => {
             inheritance.push({ child: symbolName, parent });
@@ -94,6 +108,7 @@ export function extractSymbolsAndInheritance(content) {
             if (clean) comment = clean + (comment ? ' ' + comment : '');
             if (comment.length > 100) break; 
           } else if (line === '' && comment === '') continue;
+          else if (line.startsWith('@')) continue; // Skip annotations in comment search
           else break;
         }
 
@@ -106,7 +121,8 @@ export function extractSymbolsAndInheritance(content) {
           }
         }
         
-        symbols.push(context ? `${symbolName} [${context}]` : symbolName);
+        const displaySymbol = annotation ? `${annotation} ${symbolName}` : symbolName;
+        symbols.push(context ? `${displaySymbol} [${context}]` : displaySymbol);
       }
     }
   }
@@ -125,7 +141,8 @@ export function extractEdges(content) {
     while ((match = regex.exec(noComments)) !== null) {
       if (match[1]) {
         const dep = match[1];
-        if (dep.length > 1 && !['style', 'react', 'vue', 'flutter'].includes(dep.toLowerCase())) {
+        // Filter out obvious noise, common library names, or keywords
+        if (dep.length > 1 && !['style', 'react', 'vue', 'flutter', 'new', 'const', 'let', 'var', 'dependencies', 'from', 'import'].includes(dep.toLowerCase())) {
           dependencies.add(dep);
         }
       }

package/llm-code-graph.md

@@ -1,20 +1,14 @@
 # CODE_GRAPH_MAP
 > LLM_ONLY: DO NOT EDIT. COMPACT PROJECT MAP.
 
-- index.js | desc: Contains 7 symbols.
-  - syms: [SUPPORTED_EXTENSIONS [= [], extractSymbolsAndInheritance [(content)], generate [(cwd = process.cwd()], getIgnores [(cwd, additionalLines = [])], installHook [(cwd = process.cwd()], walk [(dir, ig)], watch [(cwd = process.cwd()]]
-- test/index.test.js | desc: Contains 8 symbols.
-  - syms: [AdminUser [extends BaseUser], IRepository [implements IBase], MyWidget [: StatelessWidget], ignored [by subdir/.gitignore], included [.js'), 'function included()], noDocFunc [(arg1: string, arg2: number)], realFunction [()], testFunc [This is a test function]]
+- index.js | desc: Contains 5 symbols.
+  - syms: [SUPPORTED_EXTENSIONS [= [], extractSymbolsAndInheritance [(content)], generate [(cwd = process.cwd()], getIgnores [(cwd, additionalLines = [])], walk [(dir, ig)]]
+- test/index.test.js
 
 ## GRAPH EDGES
-[AdminUser] -> [inherits] -> [BaseUser]
-[IRepository] -> [inherits] -> [IBase]
-[MyWidget] -> [inherits] -> [StatelessWidget]
 [index.js] -> [imports] -> [chokidar]
-[index.js] -> [imports] -> [dependencies]
 [index.js] -> [imports] -> [fs]
 [index.js] -> [imports] -> [ignore]
-[index.js] -> [imports] -> [new]
 [index.js] -> [imports] -> [path]
 [index.js] -> [imports] -> [url]
 [test/index.test.js] -> [imports] -> [../index.js]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-graph-llm",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Compact, language-agnostic codebase mapper for LLM token efficiency.",
   "main": "index.js",
   "bin": {
@@ -18,7 +18,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/youruser/code-graph.git"
+    "url": "https://github.com/jabhijeet/code-graph.git"
   },
   "dependencies": {
     "chokidar": "^3.6.0",

package/test/index.test.js

@@ -67,6 +67,20 @@ test('extractEdges - Imports and includes', () => {
   assert.ok(edges.includes('header.h'));
 });
 
+test('extractSymbols - Java/Spring Annotations', () => {
+  const code = `
+    @RestController
+    public class MyController {
+        @GetMapping("/test")
+        public String hello() { return "hi"; }
+    }
+  `;
+  const { symbols } = extractSymbolsAndInheritance(code);
+  assert.ok(symbols.some(s => s.includes('@RestController MyController')));
+  // Note: Strings are stripped during extraction to avoid false positives
+  assert.ok(symbols.some(s => s.includes('@GetMapping() hello')));
+});
+
 test('getIgnores - Default Patterns', () => {
   const ig = getIgnores(process.cwd());
   assert.strictEqual(ig.ignores('.git/'), true);