tree-sitter-analyzer 1.7.5__py3-none-any.whl → 1.8.2__py3-none-any.whl

tree_sitter_analyzer/queries/markdown.py

@@ -8,223 +8,113 @@ links, code blocks, lists, and other structural elements.
 
 from typing import Dict, List
 
-# Markdown element extraction queries
+# Markdown element extraction queries - simplified for compatibility
 MARKDOWN_QUERIES: Dict[str, str] = {
-    # Headers (H1-H6)
+    # Headers (H1-H6) - simplified
     "headers": """
-    (atx_heading
-        (atx_h1_marker) @h1.marker
-        heading_content: (inline) @h1.content) @h1.heading
-    
-    (atx_heading
-        (atx_h2_marker) @h2.marker
-        heading_content: (inline) @h2.content) @h2.heading
-    
-    (atx_heading
-        (atx_h3_marker) @h3.marker
-        heading_content: (inline) @h3.content) @h3.heading
-    
-    (atx_heading
-        (atx_h4_marker) @h4.marker
-        heading_content: (inline) @h4.content) @h4.heading
-    
-    (atx_heading
-        (atx_h5_marker) @h5.marker
-        heading_content: (inline) @h5.content) @h5.heading
-    
-    (atx_heading
-        (atx_h6_marker) @h6.marker
-        heading_content: (inline) @h6.content) @h6.heading
-    
-    (setext_heading
-        heading_content: (paragraph) @setext.content
-        (setext_h1_underline) @setext.h1) @setext.h1.heading
-    
-    (setext_heading
-        heading_content: (paragraph) @setext.content
-        (setext_h2_underline) @setext.h2) @setext.h2.heading
+    (atx_heading) @header
+    (setext_heading) @header
     """,
     
-    # Code blocks
+    # Code blocks - simplified
     "code_blocks": """
-    (fenced_code_block
-        (fenced_code_block_delimiter) @code.start
-        (info_string)? @code.language
-        (code_fence_content) @code.content
-        (fenced_code_block_delimiter) @code.end) @code.block
-    
-    (indented_code_block
-        (code_fence_content) @indented_code.content) @indented_code.block
+    (fenced_code_block) @code_block
+    (indented_code_block) @code_block
     """,
     
-    # Inline code
+    # Inline code - simplified
     "inline_code": """
-    (code_span
-        (code_span_delimiter) @inline_code.start
-        (code_span_content) @inline_code.content
-        (code_span_delimiter) @inline_code.end) @inline_code.span
+    (inline) @inline
     """,
     
-    # Links
+    # Links - simplified to avoid invalid node types
     "links": """
-    (link
-        (link_text) @link.text
-        (link_destination) @link.url
-        (link_title)? @link.title) @link.element
-    
-    (autolink
-        (uri_autolink) @autolink.uri) @autolink.element
-    
-    (autolink
-        (email_autolink) @autolink.email) @autolink.element
-    
-    (reference_link
-        (link_text) @ref_link.text
-        (link_label) @ref_link.label) @ref_link.element
-    
-    (link_reference_definition
-        (link_label) @link_def.label
-        (link_destination) @link_def.url
-        (link_title)? @link_def.title) @link_def.element
+    (inline) @inline
     """,
     
-    # Images
+    # Images - simplified to avoid invalid node types
     "images": """
-    (image
-        (image_description) @image.alt
-        (link_destination) @image.url
-        (link_title)? @image.title) @image.element
-    
-    (reference_image
-        (image_description) @ref_image.alt
-        (link_label) @ref_image.label) @ref_image.element
+    (inline) @inline
     """,
     
-    # Lists
+    # Lists - simplified to avoid invalid node types
     "lists": """
-    (list
-        (list_item
-            (list_marker) @list_item.marker
-            (paragraph)? @list_item.content) @list_item.element) @list.element
-    
-    (tight_list
-        (list_item
-            (list_marker) @tight_list_item.marker
-            (paragraph)? @tight_list_item.content) @tight_list_item.element) @tight_list.element
+    (list) @list
+    (list_item) @list_item
     """,
     
-    # Emphasis and strong
+    # Emphasis and strong - simplified
     "emphasis": """
-    (emphasis
-        (emphasis_delimiter) @emphasis.start
-        (inline) @emphasis.content
-        (emphasis_delimiter) @emphasis.end) @emphasis.element
-    
-    (strong_emphasis
-        (strong_emphasis_delimiter) @strong.start
-        (inline) @strong.content
-        (strong_emphasis_delimiter) @strong.end) @strong.element
+    (inline) @inline
     """,
     
-    # Blockquotes
+    # Blockquotes - simplified
     "blockquotes": """
-    (block_quote
-        (block_quote_marker) @blockquote.marker
-        (paragraph) @blockquote.content) @blockquote.element
+    (block_quote) @blockquote
     """,
     
-    # Tables
+    # Tables - simplified
     "tables": """
-    (pipe_table
-        (pipe_table_header
-            (pipe_table_cell) @table_header.cell) @table.header
-        (pipe_table_delimiter_row) @table.delimiter
-        (pipe_table_row
-            (pipe_table_cell) @table_row.cell) @table.row) @table.element
+    (pipe_table) @table
     """,
     
-    # Horizontal rules
+    # Horizontal rules - simplified
     "horizontal_rules": """
-    (thematic_break) @hr.element
+    (thematic_break) @hr
     """,
     
-    # HTML blocks
+    # HTML blocks - simplified
     "html_blocks": """
-    (html_block) @html.block
+    (html_block) @html_block
     """,
     
-    # Inline HTML
+    # Inline HTML - simplified
     "inline_html": """
-    (html_tag) @html.inline
+    (inline) @inline
     """,
     
-    # Strikethrough (if supported)
+    # Strikethrough - simplified
     "strikethrough": """
-    (strikethrough
-        (strikethrough_delimiter) @strike.start
-        (inline) @strike.content
-        (strikethrough_delimiter) @strike.end) @strike.element
+    (inline) @inline
     """,
     
-    # Task lists (if supported)
+    # Task lists - simplified
     "task_lists": """
-    (list_item
-        (list_marker) @task.marker
-        (task_list_marker_checked) @task.checked) @task.checked_item
-    
-    (list_item
-        (list_marker) @task.marker
-        (task_list_marker_unchecked) @task.unchecked) @task.unchecked_item
+    (list_item) @list_item
     """,
     
-    # Footnotes
+    # Footnotes - simplified
     "footnotes": """
-    (footnote_reference
-        (footnote_label) @footnote.ref_label) @footnote.reference
-    
-    (footnote_definition
-        (footnote_label) @footnote.def_label
-        (paragraph) @footnote.content) @footnote.definition
+    (paragraph) @paragraph
+    (inline) @inline
     """,
     
-    # All text content
+    # All text content - simplified
     "text_content": """
-    (paragraph
-        (inline) @text.content) @text.paragraph
-    
-    (inline) @text.inline
+    (paragraph) @paragraph
+    (inline) @inline
     """,
     
-    # Document structure
+    # Document structure - simplified
     "document": """
-    (document) @document.root
+    (document) @document
     """,
     
-    # All elements (comprehensive)
+    # All elements (comprehensive) - simplified
     "all_elements": """
-    (atx_heading) @element.heading
-    (setext_heading) @element.heading
-    (fenced_code_block) @element.code_block
-    (indented_code_block) @element.code_block
-    (code_span) @element.inline_code
-    (link) @element.link
-    (autolink) @element.autolink
-    (reference_link) @element.ref_link
-    (image) @element.image
-    (reference_image) @element.ref_image
-    (list) @element.list
-    (tight_list) @element.list
-    (emphasis) @element.emphasis
-    (strong_emphasis) @element.strong
-    (strikethrough) @element.strikethrough
-    (block_quote) @element.blockquote
-    (pipe_table) @element.table
-    (thematic_break) @element.hr
-    (html_block) @element.html_block
-    (html_tag) @element.html_inline
-    (footnote_reference) @element.footnote_ref
-    (footnote_definition) @element.footnote_def
-    (paragraph) @element.paragraph
+    (atx_heading) @heading
+    (setext_heading) @heading
+    (fenced_code_block) @code_block
+    (indented_code_block) @code_block
+    (inline) @inline
+    (list) @list
+    (list_item) @list_item
+    (block_quote) @blockquote
+    (pipe_table) @table
+    (thematic_break) @hr
+    (html_block) @html_block
+    (paragraph) @paragraph
+    (link_reference_definition) @reference
     """,
 }
 

tree_sitter_analyzer/query_loader.py

@@ -55,6 +55,13 @@ class QueryLoader:
 
     def load_language_queries(self, language: str) -> dict:
         """Load queries for a specific language with optimized caching."""
+        # Handle None or empty language - return empty dict without warning
+        if not language or language == "None" or language.strip() == "":
+            return {}
+            
+        # Normalize language name
+        language = language.strip().lower()
+            
         if language in self._failed_languages:
             return {}
 
@@ -87,9 +94,7 @@ class QueryLoader:
             return queries
 
         except ImportError:
-            log_warning(
-                f"No dynamic query module for '{language}', using predefined queries."
-            )
+            # Silently handle missing query modules - no warnings needed
             self._loaded_queries[language] = queries
             return queries
         except Exception as e:
@@ -100,6 +105,10 @@ class QueryLoader:
 
     def get_query(self, language: str, query_name: str) -> str | None:
         """Get a specific query for a language with optimized lookup."""
+        # Handle invalid language early
+        if not language or language == "None" or language.strip() == "":
+            return None
+            
         queries = self.load_language_queries(language)
 
         if query_name in queries:
@@ -128,6 +137,10 @@ class QueryLoader:
 
     def list_queries_for_language(self, language: str) -> list[str]:
         """List all available queries for a language."""
+        # Handle invalid language early
+        if not language or language == "None" or language.strip() == "":
+            return []
+            
         queries = self.load_language_queries(language)
         return list(queries.keys())