-
Notifications
You must be signed in to change notification settings - Fork 46
Add support for JavaScript #593
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4e44a0a
Add support for JavaScript
gkorland 0f193ce
fix: address review feedback for JavaScript analyzer
gkorland 1de114e
fix(javascript): address review comments and improve test coverage
gkorland bbad52d
fix(javascript): skip NullLanguageServer in second pass, add integrat…
gkorland 5780d2b
fix(analyzers): guard against KeyError for ignored files in second_pass
gkorland File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| """JavaScript analyzer using tree-sitter for code entity extraction.""" | ||
|
|
||
| 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): | ||
| """Analyzer for JavaScript source files using tree-sitter. | ||
|
|
||
| Extracts functions, classes, and methods from JavaScript code. | ||
| Resolves class inheritance (extends) and function/method call references. | ||
| """ | ||
|
|
||
| def __init__(self) -> None: | ||
| """Initialize the JavaScript analyzer with the tree-sitter JS grammar.""" | ||
| super().__init__(Language(tsjs.language())) | ||
|
|
||
| def add_dependencies(self, path: Path, files: list[Path]) -> None: | ||
| """Detect and register JavaScript project dependencies. | ||
|
|
||
| Currently a no-op; npm dependency resolution is not yet implemented. | ||
| """ | ||
| pass | ||
|
|
||
| def get_entity_label(self, node: Node) -> str: | ||
| """Return the graph label for a given AST node type. | ||
|
|
||
| Args: | ||
| node: A tree-sitter AST node representing a JavaScript entity. | ||
|
|
||
| Returns: | ||
| One of 'Function', 'Class', or 'Method'. | ||
|
|
||
| Raises: | ||
| ValueError: If the node type is not a recognised entity. | ||
| """ | ||
| 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: | ||
| """Extract the declared name from a JavaScript entity node. | ||
|
|
||
| Args: | ||
| node: A tree-sitter AST node for a function, class, or method. | ||
|
|
||
| Returns: | ||
| The entity name, or an empty string if no name node is found. | ||
|
|
||
| Raises: | ||
| ValueError: If the node type is not a recognised entity. | ||
| """ | ||
| 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]: | ||
| """Extract a leading comment as a docstring for the entity. | ||
|
|
||
| Looks for a comment node immediately preceding the entity in the AST. | ||
|
|
||
| Args: | ||
| node: A tree-sitter AST node for a function, class, or method. | ||
|
|
||
| Returns: | ||
| The comment text, or None if no leading comment exists. | ||
|
|
||
| Raises: | ||
| ValueError: If the node type is not a recognised entity. | ||
| """ | ||
| 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 the tree-sitter node types recognised as JavaScript entities.""" | ||
| return ['function_declaration', 'class_declaration', 'method_definition'] | ||
|
|
||
| def add_symbols(self, entity: Entity) -> None: | ||
| """Extract symbols (references) from a JavaScript entity. | ||
|
|
||
| For classes: extracts base-class identifiers from ``extends`` clauses. | ||
| For functions/methods: extracts call-expression references. | ||
|
|
||
| Note: | ||
| JavaScript parameters are untyped, so they are not captured as | ||
| symbols — unlike typed languages (Java, Python) where parameter | ||
| type annotations are meaningful for resolution. | ||
| """ | ||
| if entity.node.type == 'class_declaration': | ||
| 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) | ||
|
|
||
| def is_dependency(self, file_path: str) -> bool: | ||
| """Check whether a file path belongs to an external dependency. | ||
|
|
||
| Uses path-segment matching so that directories merely containing | ||
| 'node_modules' in their name (e.g. ``node_modules_utils``) are not | ||
| treated as dependencies. | ||
| """ | ||
| return "node_modules" in Path(file_path).parts | ||
|
|
||
| def resolve_path(self, file_path: str, path: Path) -> str: | ||
| """Resolve an import path relative to the project root.""" | ||
| return file_path | ||
|
|
||
| def resolve_type(self, files: dict[Path, File], lsp: SyncLanguageServer, file_path: Path, path: Path, node: Node) -> list[Entity]: | ||
| """Resolve a type reference to its class declaration 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]: | ||
| """Resolve a call expression to the target function or method 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]: | ||
| """Dispatch symbol resolution based on the symbol category. | ||
|
|
||
| Routes ``base_class`` symbols to type resolution and ``call`` symbols | ||
| to method resolution. | ||
| """ | ||
| if key == "base_class": | ||
| return self.resolve_type(files, lsp, file_path, path, symbol) | ||
| elif key == "call": | ||
| return self.resolve_method(files, lsp, file_path, path, symbol) | ||
| else: | ||
| raise ValueError(f"Unknown key {key}") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.