tree-sitter-analyzer 1.9.2__py3-none-any.whl → 1.9.4__py3-none-any.whl

tree_sitter_analyzer/languages/javascript_plugin.py

@@ -205,7 +205,7 @@ class JavaScriptElementExtractor(ElementExtractor):
 
     def _traverse_and_extract_iterative(
         self,
-        root_node: "tree_sitter.Node",
+        root_node: Optional["tree_sitter.Node"],
         extractors: dict[str, Any],
         results: list[Any],
         element_type: str,
@@ -315,7 +315,8 @@ class JavaScriptElementExtractor(ElementExtractor):
 
                 if start_point[0] == end_point[0]:
                     line = self.content_lines[start_point[0]]
-                    return line[start_point[1] : end_point[1]]
+                    result: str = line[start_point[1] : end_point[1]]
+                    return result
                 else:
                     lines = []
                     for i in range(start_point[0], end_point[0] + 1):
@@ -494,7 +495,6 @@ class JavaScriptElementExtractor(ElementExtractor):
             )
         except Exception as e:
             log_debug(f"Failed to extract method info: {e}")
-            # Re-raise for debugging
             raise
 
     def _extract_generator_function_optimized(
@@ -645,13 +645,9 @@ class JavaScriptElementExtractor(ElementExtractor):
                 raw_text=raw_text,
                 language="javascript",
                 variable_type=self._infer_type_from_value(prop_value),
-                value=prop_value,
                 is_static=is_static,
                 is_constant=False,  # Class properties are not const
-                # JavaScript-specific properties
-                # class_name=class_name,  # Not available since class_name is commented out
-                declaration_kind="property",
-                framework_type=self.framework_type,
+                initializer=prop_value,
             )
         except Exception as e:
             log_debug(f"Failed to extract property info: {e}")
@@ -824,7 +820,7 @@ class JavaScriptElementExtractor(ElementExtractor):
                 is_setter = True
 
             return (
-                name,
+                name or "",
                 parameters,
                 is_async,
                 is_static,
@@ -948,12 +944,8 @@ class JavaScriptElementExtractor(ElementExtractor):
                 raw_text=import_text,
                 language="javascript",
                 module_path=source,
-                # JavaScript-specific properties
-                import_type=import_type,
+                module_name=source,
                 imported_names=names,
-                is_default=is_default,
-                is_namespace=is_namespace,
-                is_dynamic=False,
             )
         except Exception as e:
             log_debug(f"Failed to extract import info: {e}")
@@ -980,9 +972,8 @@ class JavaScriptElementExtractor(ElementExtractor):
                 raw_text=node_text,
                 language="javascript",
                 module_path=source,
-                # JavaScript-specific properties
-                import_type="dynamic",
-                is_dynamic=True,
+                module_name=source,
+                imported_names=["dynamic_import"],
             )
         except Exception as e:
             log_debug(f"Failed to extract dynamic import: {e}")
@@ -1019,7 +1010,6 @@ class JavaScriptElementExtractor(ElementExtractor):
 
         except Exception as e:
             log_debug(f"Failed to extract CommonJS requires: {e}")
-            # Re-raise for debugging
             raise
 
         return imports
@@ -1218,9 +1208,11 @@ class JavaScriptElementExtractor(ElementExtractor):
         else:
             return "unknown"
 
-    def extract_elements(self, tree: "tree_sitter.Tree", source_code: str) -> list:
+    def extract_elements(
+        self, tree: "tree_sitter.Tree", source_code: str
+    ) -> list[CodeElement]:
         """Extract elements from source code using tree-sitter AST"""
-        elements = []
+        elements: list[CodeElement] = []
 
         try:
             elements.extend(self.extract_functions(tree, source_code))
@@ -1293,7 +1285,7 @@ class JavaScriptElementExtractor(ElementExtractor):
                             return cleaned
                         current_line -= 1
 
-            self._jsdoc_cache[target_line] = None
+            self._jsdoc_cache[target_line] = ""
             return None
 
         except Exception as e:
@@ -1441,62 +1433,13 @@ class JavaScriptPlugin(LanguagePlugin):
         }
 
     def execute_query_strategy(
-        self, tree: "tree_sitter.Tree", source_code: str, query_key: str
-    ) -> list[dict]:
-        """
-        Execute query strategy for JavaScript language
-
-        Args:
-            tree: Tree-sitter tree object
-            source_code: Source code string
-            query_key: Query key to execute
-
-        Returns:
-            List of query results
-        """
-        # Use the extractor to get elements based on query_key
-        extractor = self.get_extractor()
+        self, query_key: str | None, language: str
+    ) -> str | None:
+        """Execute query strategy for JavaScript language"""
+        queries = self.get_queries()
+        return queries.get(query_key) if query_key else None
 
-        # Map query keys to extraction methods
-        if query_key in [
-            "function",
-            "functions",
-            "async_function",
-            "async_functions",
-            "arrow_function",
-            "arrow_functions",
-            "method",
-            "methods",
-            "constructor",
-            "constructors",
-        ]:
-            elements = extractor.extract_functions(tree, source_code)
-        elif query_key in ["class", "classes", "react_component", "react_components"]:
-            elements = extractor.extract_classes(tree, source_code)
-        elif query_key in ["variable", "variables"]:
-            elements = extractor.extract_variables(tree, source_code)
-        elif query_key in ["import", "imports"]:
-            elements = extractor.extract_imports(tree, source_code)
-        else:
-            # For unknown query keys, return empty list
-            return []
-
-        # Convert elements to query result format
-        results = []
-        for element in elements:
-            result = {
-                "capture_name": query_key,
-                "node_type": self._get_node_type_for_element(element),
-                "start_line": element.start_line,
-                "end_line": element.end_line,
-                "text": element.raw_text,
-                "name": element.name,
-            }
-            results.append(result)
-
-        return results
-
-    def _get_node_type_for_element(self, element) -> str:
+    def _get_node_type_for_element(self, element: Any) -> str:
         """Get appropriate node type for element"""
         from ..models import Class, Function, Import, Variable
 
@@ -1592,8 +1535,9 @@ class JavaScriptPlugin(LanguagePlugin):
             )
 
         try:
-            with open(file_path, encoding="utf-8") as f:
-                source_code = f.read()
+            from ..encoding_utils import read_file_safe
+
+            source_code, _ = read_file_safe(file_path)
 
             parser = tree_sitter.Parser()
             parser.language = language