Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
104 changes: 104 additions & 0 deletions api/analyzers/javascript/analyzer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
from pathlib import Path
from typing import Optional

from multilspy import SyncLanguageServer
from ...entities.entity import Entity
from ...entities.file import File
from ..analyzer import AbstractAnalyzer

import tree_sitter_javascript as tsjs
from tree_sitter import Language, Node

import logging
logger = logging.getLogger('code_graph')


class JavaScriptAnalyzer(AbstractAnalyzer):
def __init__(self) -> None:
super().__init__(Language(tsjs.language()))

def add_dependencies(self, path: Path, files: list[Path]):
pass

def get_entity_label(self, node: Node) -> str:
if node.type == 'function_declaration':
return "Function"
elif node.type == 'class_declaration':
return "Class"
elif node.type == 'method_definition':
return "Method"
raise ValueError(f"Unknown entity type: {node.type}")

def get_entity_name(self, node: Node) -> str:
if node.type in ['function_declaration', 'class_declaration', 'method_definition']:
name_node = node.child_by_field_name('name')
if name_node is None:
return ''
return name_node.text.decode('utf-8')
raise ValueError(f"Unknown entity type: {node.type}")

def get_entity_docstring(self, node: Node) -> Optional[str]:
if node.type in ['function_declaration', 'class_declaration', 'method_definition']:
if node.prev_sibling and node.prev_sibling.type == 'comment':
return node.prev_sibling.text.decode('utf-8')
return None
raise ValueError(f"Unknown entity type: {node.type}")

def get_entity_types(self) -> list[str]:
return ['function_declaration', 'class_declaration', 'method_definition']

def add_symbols(self, entity: Entity) -> None:
if entity.node.type == 'class_declaration':
# Check for `extends` clause via class_heritage
for child in entity.node.children:
if child.type == 'class_heritage':
for heritage_child in child.children:
if heritage_child.type == 'identifier':
entity.add_symbol("base_class", heritage_child)
elif entity.node.type in ['function_declaration', 'method_definition']:
captures = self._captures("(call_expression) @reference.call", entity.node)
if 'reference.call' in captures:
for caller in captures['reference.call']:
entity.add_symbol("call", caller)
captures = self._captures("(formal_parameters (identifier) @parameter)", entity.node)
if 'parameter' in captures:
for parameter in captures['parameter']:
entity.add_symbol("parameters", parameter)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

def is_dependency(self, file_path: str) -> bool:
return "node_modules" in file_path
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

def resolve_path(self, file_path: str, path: Path) -> str:
return file_path

def resolve_type(self, files: dict[Path, File], lsp: SyncLanguageServer, file_path: Path, path: Path, node: Node) -> list[Entity]:
res = []
for file, resolved_node in self.resolve(files, lsp, file_path, path, node):
type_dec = self.find_parent(resolved_node, ['class_declaration'])
if type_dec in file.entities:
res.append(file.entities[type_dec])
return res

def resolve_method(self, files: dict[Path, File], lsp: SyncLanguageServer, file_path: Path, path: Path, node: Node) -> list[Entity]:
res = []
if node.type == 'call_expression':
func_node = node.child_by_field_name('function')
if func_node and func_node.type == 'member_expression':
func_node = func_node.child_by_field_name('property')
if func_node:
node = func_node
for file, resolved_node in self.resolve(files, lsp, file_path, path, node):
method_dec = self.find_parent(resolved_node, ['function_declaration', 'method_definition', 'class_declaration'])
if method_dec and method_dec.type == 'class_declaration':
continue
if method_dec in file.entities:
res.append(file.entities[method_dec])
return res

def resolve_symbol(self, files: dict[Path, File], lsp: SyncLanguageServer, file_path: Path, path: Path, key: str, symbol: Node) -> list[Entity]:
if key in ["base_class", "parameters"]:
return self.resolve_type(files, lsp, file_path, path, symbol)
elif key in ["call"]:
return self.resolve_method(files, lsp, file_path, path, symbol)
else:
raise ValueError(f"Unknown key {key}")
9 changes: 6 additions & 3 deletions api/analyzers/source_analyzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from .java.analyzer import JavaAnalyzer
from .python.analyzer import PythonAnalyzer
from .csharp.analyzer import CSharpAnalyzer
from .javascript.analyzer import JavaScriptAnalyzer

from multilspy import SyncLanguageServer
from multilspy.multilspy_config import MultilspyConfig
Expand All @@ -26,7 +27,8 @@
# '.h': CAnalyzer(),
'.py': PythonAnalyzer(),
'.java': JavaAnalyzer(),
'.cs': CSharpAnalyzer()}
'.cs': CSharpAnalyzer(),
'.js': JavaScriptAnalyzer()}
Comment thread
gkorland marked this conversation as resolved.

class NullLanguageServer:
def start_server(self):
Expand Down Expand Up @@ -143,7 +145,8 @@ def second_pass(self, graph: Graph, files: list[Path], path: Path) -> None:
lsps[".cs"] = SyncLanguageServer.create(config, logger, str(path))
else:
lsps[".cs"] = NullLanguageServer()
with lsps[".java"].start_server(), lsps[".py"].start_server(), lsps[".cs"].start_server():
lsps[".js"] = NullLanguageServer()
with lsps[".java"].start_server(), lsps[".py"].start_server(), lsps[".cs"].start_server(), lsps[".js"].start_server():
Comment thread
coderabbitai[bot] marked this conversation as resolved.
files_len = len(self.files)
for i, file_path in enumerate(files):
file = self.files[file_path]
Expand Down Expand Up @@ -174,7 +177,7 @@ def analyze_files(self, files: list[Path], path: Path, graph: Graph) -> None:

def analyze_sources(self, path: Path, ignore: list[str], graph: Graph) -> None:
path = path.resolve()
files = list(path.rglob("*.java")) + list(path.rglob("*.py")) + list(path.rglob("*.cs"))
files = list(path.rglob("*.java")) + list(path.rglob("*.py")) + list(path.rglob("*.cs")) + [f for f in path.rglob("*.js") if "node_modules" not in f.parts]
# First pass analysis of the source code
self.first_pass(path, files, ignore, graph)

Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies = [
"tree-sitter-c>=0.24.1,<0.25.0",
"tree-sitter-python>=0.25.0,<0.26.0",
"tree-sitter-java>=0.23.5,<0.24.0",
"tree-sitter-javascript>=0.23.0,<0.24.0",
"tree-sitter-c-sharp>=0.23.1,<0.24.0",
"fastapi>=0.115.0,<1.0.0",
"uvicorn[standard]>=0.34.0,<1.0.0",
Expand Down
31 changes: 31 additions & 0 deletions tests/source_files/javascript/sample.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/**
* Base class for shapes
*/
class Shape {
constructor(name) {
this.name = name;
}

area() {
return 0;
}
}

class Circle extends Shape {
constructor(radius) {
super(radius);
this.radius = radius;
}

area() {
return Math.PI * this.radius * this.radius;
}
}

function calculateTotal(shapes) {
let total = 0;
for (const shape of shapes) {
total += shape.area();
}
return total;
}
102 changes: 102 additions & 0 deletions tests/test_javascript_analyzer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
"""Tests for the JavaScript analyzer - extraction only (no DB required)."""

import unittest
from pathlib import Path
Comment thread
coderabbitai[bot] marked this conversation as resolved.

from api.analyzers.javascript.analyzer import JavaScriptAnalyzer
from api.entities.entity import Entity
from api.entities.file import File


def _entity_name(analyzer, entity):
"""Get the name of an entity using the analyzer."""
return analyzer.get_entity_name(entity.node)


class TestJavaScriptAnalyzer(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.analyzer = JavaScriptAnalyzer()
source_dir = Path(__file__).parent / "source_files" / "javascript"
cls.sample_path = source_dir / "sample.js"
source = cls.sample_path.read_bytes()
tree = cls.analyzer.parser.parse(source)
cls.file = File(cls.sample_path, tree)

# Walk AST and extract entities (mirrors create_hierarchy without Graph)
types = cls.analyzer.get_entity_types()
stack = [tree.root_node]
while stack:
node = stack.pop()
if node.type in types:
entity = Entity(node)
cls.analyzer.add_symbols(entity)
cls.file.add_entity(entity)
# Also recurse into entity children (e.g., class body methods)
stack.extend(node.children)
else:
stack.extend(node.children)

def _entity_names(self):
return [_entity_name(self.analyzer, e) for e in self.file.entities.values()]

def test_discovers_js_files(self):
"""SourceAnalyzer should enumerate .js files."""
source_dir = Path(__file__).parent / "source_files" / "javascript"
js_files = list(source_dir.rglob("*.js"))
self.assertTrue(len(js_files) > 0, "Should find .js files")
Comment thread
coderabbitai[bot] marked this conversation as resolved.

def test_entity_types(self):
"""Analyzer should recognise JS entity types."""
self.assertEqual(
self.analyzer.get_entity_types(),
['function_declaration', 'class_declaration', 'method_definition'],
)

def test_class_extraction(self):
"""Classes should be extracted from sample.js."""
names = self._entity_names()
self.assertIn("Shape", names)
self.assertIn("Circle", names)

def test_function_extraction(self):
"""Top-level functions should be extracted."""
names = self._entity_names()
self.assertIn("calculateTotal", names)

def test_method_extraction(self):
"""Class methods should be extracted."""
names = self._entity_names()
self.assertIn("area", names)
self.assertIn("constructor", names)

def test_class_labels(self):
"""Classes should get the 'Class' label."""
for entity in self.file.entities.values():
if _entity_name(self.analyzer, entity) in ("Shape", "Circle"):
self.assertEqual(self.analyzer.get_entity_label(entity.node), "Class")

def test_function_label(self):
"""Functions should get the 'Function' label."""
for entity in self.file.entities.values():
if _entity_name(self.analyzer, entity) == "calculateTotal":
self.assertEqual(self.analyzer.get_entity_label(entity.node), "Function")

def test_base_class_symbol(self):
"""Circle should have Shape as a base_class symbol."""
for entity in self.file.entities.values():
if _entity_name(self.analyzer, entity) == "Circle":
base_names = [
s.symbol.text.decode("utf-8")
for s in entity.symbols.get("base_class", [])
]
self.assertIn("Shape", base_names)

def test_is_dependency(self):
"""node_modules paths should be flagged as dependencies."""
self.assertTrue(self.analyzer.is_dependency("foo/node_modules/bar/index.js"))
self.assertFalse(self.analyzer.is_dependency("src/utils.js"))


if __name__ == "__main__":
unittest.main()
17 changes: 17 additions & 0 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading