tree-sitter-analyzer 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

tree_sitter_analyzer/formatters/python_formatter.py

@@ -1,259 +1,259 @@
-#!/usr/bin/env python3
-"""
-Python-specific table formatter.
-"""
-
-from typing import Any
-
-from .base_formatter import BaseTableFormatter
-
-
-class PythonTableFormatter(BaseTableFormatter):
-    """Python言語専用のテーブルフォーマッター"""
-
-    def _format_full_table(self, data: dict[str, Any]) -> str:
-        """Python用完全版テーブル形式"""
-        lines = []
-
-        # ヘッダー - Python用（複数クラス対応）
-        classes = data.get("classes", [])
-        if len(classes) > 1:
-            # 複数クラスがある場合はファイル名を使用
-            file_name = data.get("file_path", "Unknown").split("/")[-1].split("\\")[-1]
-            lines.append(f"# {file_name}")
-        else:
-            # 単一クラスの場合はクラス名を使用
-            class_name = classes[0].get("name", "Unknown") if classes else "Unknown"
-            lines.append(f"# {class_name}")
-        lines.append("")
-
-        # Imports
-        imports = data.get("imports", [])
-        if imports:
-            lines.append("## Imports")
-            lines.append("```python")
-            for imp in imports:
-                lines.append(str(imp.get("statement", "")))
-            lines.append("```")
-            lines.append("")
-
-        # Classes - Python用（複数クラス対応）
-        if len(classes) > 1:
-            lines.append("## Classes")
-            lines.append("| Class | Type | Visibility | Lines | Methods | Fields |")
-            lines.append("|-------|------|------------|-------|---------|--------|")
-
-            for class_info in classes:
-                name = str(class_info.get("name", "Unknown"))
-                class_type = str(class_info.get("type", "class"))
-                visibility = str(class_info.get("visibility", "public"))
-                line_range = class_info.get("line_range", {})
-                lines_str = f"{line_range.get('start', 0)}-{line_range.get('end', 0)}"
-
-                # このクラスのメソッド数とフィールド数を計算
-                class_methods = [
-                    m
-                    for m in data.get("methods", [])
-                    if line_range.get("start", 0)
-                    <= m.get("line_range", {}).get("start", 0)
-                    <= line_range.get("end", 0)
-                ]
-                class_fields = [
-                    f
-                    for f in data.get("fields", [])
-                    if line_range.get("start", 0)
-                    <= f.get("line_range", {}).get("start", 0)
-                    <= line_range.get("end", 0)
-                ]
-
-                lines.append(
-                    f"| {name} | {class_type} | {visibility} | {lines_str} | {len(class_methods)} | {len(class_fields)} |"
-                )
-        else:
-            # 単一クラスの場合
-            lines.append("## Class Info")
-            lines.append("| Property | Value |")
-            lines.append("|----------|-------|")
-
-            class_info = data.get("classes", [{}])[0] if data.get("classes") else {}
-            stats = data.get("statistics") or {}
-
-            lines.append("| Package | (default) |")
-            lines.append(f"| Type | {str(class_info.get('type', 'class'))} |")
-            lines.append(
-                f"| Visibility | {str(class_info.get('visibility', 'public'))} |"
-            )
-            lines.append(
-                f"| Lines | {class_info.get('line_range', {}).get('start', 0)}-{class_info.get('line_range', {}).get('end', 0)} |"
-            )
-            lines.append(f"| Total Methods | {stats.get('method_count', 0)} |")
-            lines.append(f"| Total Fields | {stats.get('field_count', 0)} |")
-
-        lines.append("")
-
-        # Fields
-        fields = data.get("fields", [])
-        if fields:
-            lines.append("## Fields")
-            lines.append("| Name | Type | Vis | Modifiers | Line | Doc |")
-            lines.append("|------|------|-----|-----------|------|-----|")
-
-            for field in fields:
-                name = str(field.get("name", ""))
-                field_type = str(field.get("type", ""))
-                visibility = self._convert_visibility(str(field.get("visibility", "")))
-                modifiers = ",".join([str(m) for m in field.get("modifiers", [])])
-                line = field.get("line_range", {}).get("start", 0)
-                doc = str(field.get("javadoc", "")) or "-"
-                doc = doc.replace("\n", " ").replace("|", "\\|")[:50]
-
-                lines.append(
-                    f"| {name} | {field_type} | {visibility} | {modifiers} | {line} | {doc} |"
-                )
-            lines.append("")
-
-        # Methods - Python用（コンストラクタ分離なし）
-        methods = data.get("methods", [])
-        if methods:
-            lines.append("## Methods")
-            lines.append("| Method | Signature | Vis | Lines | Cols | Cx | Doc |")
-            lines.append("|--------|-----------|-----|-------|------|----|----|")
-
-            for method in methods:
-                lines.append(self._format_method_row(method))
-            lines.append("")
-
-        # 末尾の空行を削除
-        while lines and lines[-1] == "":
-            lines.pop()
-
-        return "\n".join(lines)
-
-    def _format_compact_table(self, data: dict[str, Any]) -> str:
-        """Python用コンパクト版テーブル形式"""
-        lines = []
-
-        # ヘッダー
-        classes = data.get("classes", [])
-        if len(classes) > 1:
-            file_name = data.get("file_path", "Unknown").split("/")[-1].split("\\")[-1]
-            lines.append(f"# {file_name}")
-        else:
-            class_name = classes[0].get("name", "Unknown") if classes else "Unknown"
-            lines.append(f"# {class_name}")
-        lines.append("")
-
-        # 基本情報
-        stats = data.get("statistics") or {}
-        lines.append("## Info")
-        lines.append("| Property | Value |")
-        lines.append("|----------|-------|")
-        lines.append(f"| Classes | {len(classes)} |")
-        lines.append(f"| Methods | {stats.get('method_count', 0)} |")
-        lines.append(f"| Fields | {stats.get('field_count', 0)} |")
-        lines.append("")
-
-        # メソッド（簡略版）
-        methods = data.get("methods", [])
-        if methods:
-            lines.append("## Methods")
-            lines.append("| Method | Sig | V | L | Cx | Doc |")
-            lines.append("|--------|-----|---|---|----|----|")
-
-            for method in methods:
-                name = str(method.get("name", ""))
-                signature = self._create_compact_signature(method)
-                visibility = self._convert_visibility(str(method.get("visibility", "")))
-                line_range = method.get("line_range", {})
-                lines_str = f"{line_range.get('start', 0)}-{line_range.get('end', 0)}"
-                complexity = method.get("complexity_score", 0)
-                doc = self._clean_csv_text(
-                    self._extract_doc_summary(str(method.get("javadoc", "")))
-                )
-
-                lines.append(
-                    f"| {name} | {signature} | {visibility} | {lines_str} | {complexity} | {doc} |"
-                )
-            lines.append("")
-
-        # 末尾の空行を削除
-        while lines and lines[-1] == "":
-            lines.pop()
-
-        return "\n".join(lines)
-
-    def _format_method_row(self, method: dict[str, Any]) -> str:
-        """Python用メソッド行のフォーマット"""
-        name = str(method.get("name", ""))
-        signature = self._create_full_signature(method)
-        visibility = self._convert_visibility(str(method.get("visibility", "")))
-        line_range = method.get("line_range", {})
-        lines_str = f"{line_range.get('start', 0)}-{line_range.get('end', 0)}"
-        cols_str = "5-6"  # デフォルト値
-        complexity = method.get("complexity_score", 0)
-        doc = self._clean_csv_text(
-            self._extract_doc_summary(str(method.get("javadoc", "")))
-        )
-
-        return f"| {name} | {signature} | {visibility} | {lines_str} | {cols_str} | {complexity} | {doc} |"
-
-    def _create_compact_signature(self, method: dict[str, Any]) -> str:
-        """Python用コンパクトなメソッドシグネチャを作成"""
-        params = method.get("parameters", [])
-        param_types = []
-
-        for p in params:
-            if isinstance(p, dict):
-                param_types.append(self._shorten_type(p.get("type", "Any")))
-            else:
-                param_types.append("Any")
-
-        params_str = ",".join(param_types)
-        return_type = self._shorten_type(method.get("return_type", "Any"))
-
-        return f"({params_str}):{return_type}"
-
-    def _shorten_type(self, type_name: Any) -> str:
-        """Python用型名を短縮"""
-        if type_name is None:
-            return "Any"
-
-        if not isinstance(type_name, str):
-            type_name = str(type_name)
-
-        type_mapping = {
-            "str": "s",
-            "int": "i",
-            "float": "f",
-            "bool": "b",
-            "None": "N",
-            "Any": "A",
-            "List": "L",
-            "Dict": "D",
-            "Optional": "O",
-            "Union": "U",
-        }
-
-        # List[str] -> L[s]
-        if "List[" in type_name:
-            result = (
-                type_name.replace("List[", "L[").replace("str", "s").replace("int", "i")
-            )
-            return str(result)
-
-        # Dict[str, int] -> D[s,i]
-        if "Dict[" in type_name:
-            result = (
-                type_name.replace("Dict[", "D[").replace("str", "s").replace("int", "i")
-            )
-            return str(result)
-
-        # Optional[str] -> O[s]
-        if "Optional[" in type_name:
-            result = type_name.replace("Optional[", "O[").replace("str", "s")
-            return str(result)
-
-        result = type_mapping.get(
-            type_name, type_name[:3] if len(type_name) > 3 else type_name
-        )
-        return str(result)
+#!/usr/bin/env python3
+"""
+Python-specific table formatter.
+"""
+
+from typing import Any
+
+from .base_formatter import BaseTableFormatter
+
+
+class PythonTableFormatter(BaseTableFormatter):
+    """Python言語専用のテーブルフォーマッター"""
+
+    def _format_full_table(self, data: dict[str, Any]) -> str:
+        """Python用完全版テーブル形式"""
+        lines = []
+
+        # ヘッダー - Python用（複数クラス対応）
+        classes = data.get("classes", [])
+        if len(classes) > 1:
+            # 複数クラスがある場合はファイル名を使用
+            file_name = data.get("file_path", "Unknown").split("/")[-1].split("\\")[-1]
+            lines.append(f"# {file_name}")
+        else:
+            # 単一クラスの場合はクラス名を使用
+            class_name = classes[0].get("name", "Unknown") if classes else "Unknown"
+            lines.append(f"# {class_name}")
+        lines.append("")
+
+        # Imports
+        imports = data.get("imports", [])
+        if imports:
+            lines.append("## Imports")
+            lines.append("```python")
+            for imp in imports:
+                lines.append(str(imp.get("statement", "")))
+            lines.append("```")
+            lines.append("")
+
+        # Classes - Python用（複数クラス対応）
+        if len(classes) > 1:
+            lines.append("## Classes")
+            lines.append("| Class | Type | Visibility | Lines | Methods | Fields |")
+            lines.append("|-------|------|------------|-------|---------|--------|")
+
+            for class_info in classes:
+                name = str(class_info.get("name", "Unknown"))
+                class_type = str(class_info.get("type", "class"))
+                visibility = str(class_info.get("visibility", "public"))
+                line_range = class_info.get("line_range", {})
+                lines_str = f"{line_range.get('start', 0)}-{line_range.get('end', 0)}"
+
+                # このクラスのメソッド数とフィールド数を計算
+                class_methods = [
+                    m
+                    for m in data.get("methods", [])
+                    if line_range.get("start", 0)
+                    <= m.get("line_range", {}).get("start", 0)
+                    <= line_range.get("end", 0)
+                ]
+                class_fields = [
+                    f
+                    for f in data.get("fields", [])
+                    if line_range.get("start", 0)
+                    <= f.get("line_range", {}).get("start", 0)
+                    <= line_range.get("end", 0)
+                ]
+
+                lines.append(
+                    f"| {name} | {class_type} | {visibility} | {lines_str} | {len(class_methods)} | {len(class_fields)} |"
+                )
+        else:
+            # 単一クラスの場合
+            lines.append("## Class Info")
+            lines.append("| Property | Value |")
+            lines.append("|----------|-------|")
+
+            class_info = data.get("classes", [{}])[0] if data.get("classes") else {}
+            stats = data.get("statistics") or {}
+
+            lines.append("| Package | (default) |")
+            lines.append(f"| Type | {str(class_info.get('type', 'class'))} |")
+            lines.append(
+                f"| Visibility | {str(class_info.get('visibility', 'public'))} |"
+            )
+            lines.append(
+                f"| Lines | {class_info.get('line_range', {}).get('start', 0)}-{class_info.get('line_range', {}).get('end', 0)} |"
+            )
+            lines.append(f"| Total Methods | {stats.get('method_count', 0)} |")
+            lines.append(f"| Total Fields | {stats.get('field_count', 0)} |")
+
+        lines.append("")
+
+        # Fields
+        fields = data.get("fields", [])
+        if fields:
+            lines.append("## Fields")
+            lines.append("| Name | Type | Vis | Modifiers | Line | Doc |")
+            lines.append("|------|------|-----|-----------|------|-----|")
+
+            for field in fields:
+                name = str(field.get("name", ""))
+                field_type = str(field.get("type", ""))
+                visibility = self._convert_visibility(str(field.get("visibility", "")))
+                modifiers = ",".join([str(m) for m in field.get("modifiers", [])])
+                line = field.get("line_range", {}).get("start", 0)
+                doc = str(field.get("javadoc", "")) or "-"
+                doc = doc.replace("\n", " ").replace("|", "\\|")[:50]
+
+                lines.append(
+                    f"| {name} | {field_type} | {visibility} | {modifiers} | {line} | {doc} |"
+                )
+            lines.append("")
+
+        # Methods - Python用（コンストラクタ分離なし）
+        methods = data.get("methods", [])
+        if methods:
+            lines.append("## Methods")
+            lines.append("| Method | Signature | Vis | Lines | Cols | Cx | Doc |")
+            lines.append("|--------|-----------|-----|-------|------|----|----|")
+
+            for method in methods:
+                lines.append(self._format_method_row(method))
+            lines.append("")
+
+        # 末尾の空行を削除
+        while lines and lines[-1] == "":
+            lines.pop()
+
+        return "\n".join(lines)
+
+    def _format_compact_table(self, data: dict[str, Any]) -> str:
+        """Python用コンパクト版テーブル形式"""
+        lines = []
+
+        # ヘッダー
+        classes = data.get("classes", [])
+        if len(classes) > 1:
+            file_name = data.get("file_path", "Unknown").split("/")[-1].split("\\")[-1]
+            lines.append(f"# {file_name}")
+        else:
+            class_name = classes[0].get("name", "Unknown") if classes else "Unknown"
+            lines.append(f"# {class_name}")
+        lines.append("")
+
+        # 基本情報
+        stats = data.get("statistics") or {}
+        lines.append("## Info")
+        lines.append("| Property | Value |")
+        lines.append("|----------|-------|")
+        lines.append(f"| Classes | {len(classes)} |")
+        lines.append(f"| Methods | {stats.get('method_count', 0)} |")
+        lines.append(f"| Fields | {stats.get('field_count', 0)} |")
+        lines.append("")
+
+        # メソッド（簡略版）
+        methods = data.get("methods", [])
+        if methods:
+            lines.append("## Methods")
+            lines.append("| Method | Sig | V | L | Cx | Doc |")
+            lines.append("|--------|-----|---|---|----|----|")
+
+            for method in methods:
+                name = str(method.get("name", ""))
+                signature = self._create_compact_signature(method)
+                visibility = self._convert_visibility(str(method.get("visibility", "")))
+                line_range = method.get("line_range", {})
+                lines_str = f"{line_range.get('start', 0)}-{line_range.get('end', 0)}"
+                complexity = method.get("complexity_score", 0)
+                doc = self._clean_csv_text(
+                    self._extract_doc_summary(str(method.get("javadoc", "")))
+                )
+
+                lines.append(
+                    f"| {name} | {signature} | {visibility} | {lines_str} | {complexity} | {doc} |"
+                )
+            lines.append("")
+
+        # 末尾の空行を削除
+        while lines and lines[-1] == "":
+            lines.pop()
+
+        return "\n".join(lines)
+
+    def _format_method_row(self, method: dict[str, Any]) -> str:
+        """Python用メソッド行のフォーマット"""
+        name = str(method.get("name", ""))
+        signature = self._create_full_signature(method)
+        visibility = self._convert_visibility(str(method.get("visibility", "")))
+        line_range = method.get("line_range", {})
+        lines_str = f"{line_range.get('start', 0)}-{line_range.get('end', 0)}"
+        cols_str = "5-6"  # デフォルト値
+        complexity = method.get("complexity_score", 0)
+        doc = self._clean_csv_text(
+            self._extract_doc_summary(str(method.get("javadoc", "")))
+        )
+
+        return f"| {name} | {signature} | {visibility} | {lines_str} | {cols_str} | {complexity} | {doc} |"
+
+    def _create_compact_signature(self, method: dict[str, Any]) -> str:
+        """Python用コンパクトなメソッドシグネチャを作成"""
+        params = method.get("parameters", [])
+        param_types = []
+
+        for p in params:
+            if isinstance(p, dict):
+                param_types.append(self._shorten_type(p.get("type", "Any")))
+            else:
+                param_types.append("Any")
+
+        params_str = ",".join(param_types)
+        return_type = self._shorten_type(method.get("return_type", "Any"))
+
+        return f"({params_str}):{return_type}"
+
+    def _shorten_type(self, type_name: Any) -> str:
+        """Python用型名を短縮"""
+        if type_name is None:
+            return "Any"
+
+        if not isinstance(type_name, str):
+            type_name = str(type_name)
+
+        type_mapping = {
+            "str": "s",
+            "int": "i",
+            "float": "f",
+            "bool": "b",
+            "None": "N",
+            "Any": "A",
+            "List": "L",
+            "Dict": "D",
+            "Optional": "O",
+            "Union": "U",
+        }
+
+        # List[str] -> L[s]
+        if "List[" in type_name:
+            result = (
+                type_name.replace("List[", "L[").replace("str", "s").replace("int", "i")
+            )
+            return str(result)
+
+        # Dict[str, int] -> D[s,i]
+        if "Dict[" in type_name:
+            result = (
+                type_name.replace("Dict[", "D[").replace("str", "s").replace("int", "i")
+            )
+            return str(result)
+
+        # Optional[str] -> O[s]
+        if "Optional[" in type_name:
+            result = type_name.replace("Optional[", "O[").replace("str", "s")
+            return str(result)
+
+        result = type_mapping.get(
+            type_name, type_name[:3] if len(type_name) > 3 else type_name
+        )
+        return str(result)

tree_sitter_analyzer/interfaces/cli_adapter.py

@@ -2,14 +2,14 @@
 """
 CLI Adapter for tree-sitter-analyzer
 
-既存のCLI APIとの互換性を保ちながら、新しい統一解析エンジンを使用するアダプター。
+Adapter that uses the new unified analysis engine while maintaining compatibility with existing CLI API.
 
-Roo Code規約準拠:
-- 型ヒント: 全関数に型ヒント必須
-- MCPログ: 各ステップでログ出力
+Roo Code compliance:
+- Type hints: Required for all functions
+- MCP logging: Log output at each step
 - docstring: Google Style docstring
-- エラーハンドリング: 適切な例外処理
-- パフォーマンス: 統一エンジンによる最適化
+- Error handling: Proper exception handling
+- Performance: Optimization through unified engine
 """
 
 import asyncio
@@ -26,17 +26,17 @@ logger = logging.getLogger(__name__)
 
 class CLIAdapter:
     """
-    CLI用アダプター
+    CLI Adapter
 
-    既存のCLI APIとの互換性を保ちながら、新しい統一解析エンジンを使用します。
-    同期APIを提供し、内部的に非同期エンジンを呼び出します。
+    Uses the new unified analysis engine while maintaining compatibility with existing CLI API.
+    Provides synchronous API and internally calls asynchronous engine.
 
     Features:
-        - 既存API互換性の維持
-        - 統一解析エンジンの活用
-        - 同期/非同期変換
-        - パフォーマンス監視
-        - エラーハンドリング
+        - Maintaining existing API compatibility
+        - Utilizing unified analysis engine
+        - Sync/async conversion
+        - Performance monitoring
+        - Error handling
 
     Example:
         >>> adapter = CLIAdapter()
@@ -46,10 +46,10 @@ class CLIAdapter:
 
     def __init__(self) -> None:
         """
-        CLIアダプターを初期化
+        Initialize CLI adapter
 
         Raises:
-            Exception: 統一解析エンジンの初期化に失敗した場合
+            Exception: If unified analysis engine initialization fails
         """
         try:
             self._engine = UnifiedAnalysisEngine()
@@ -60,26 +60,26 @@ class CLIAdapter:
 
     def analyze_file(self, file_path: str, **kwargs: Any) -> AnalysisResult:
         """
-        ファイルを解析（同期版）
+        Analyze file (synchronous version)
 
-        既存のCLI APIとの互換性を保つため、同期インターフェースを提供します。
-        内部的には統一解析エンジンの非同期メソッドを呼び出します。
+        Provides synchronous interface to maintain compatibility with existing CLI API.
+        Internally calls asynchronous methods of unified analysis engine.
 
         Args:
-            file_path: 解析対象ファイルのパス
-            **kwargs: 解析オプション
-                - language: 言語指定（自動検出も可能）
-                - include_complexity: 複雑度計算を含める
-                - include_details: 詳細情報を含める
-                - format_type: 出力形式（"standard", "structure", "summary"）
+            file_path: Path to file to analyze
+            **kwargs: Analysis options
+                - language: Language specification (auto-detection possible)
+                - include_complexity: Include complexity calculation
+                - include_details: Include detailed information
+                - format_type: Output format ("standard", "structure", "summary")
 
         Returns:
-            AnalysisResult: 解析結果
+            AnalysisResult: Analysis result
 
         Raises:
-            ValueError: 無効なファイルパスの場合
-            FileNotFoundError: ファイルが存在しない場合
-            UnsupportedLanguageError: サポートされていない言語の場合
+            ValueError: For invalid file path
+            FileNotFoundError: If file does not exist
+            UnsupportedLanguageError: For unsupported language
 
         Example:
             >>> adapter = CLIAdapter()
@@ -88,16 +88,16 @@ class CLIAdapter:
         """
         start_time = time.time()
 
-        # 入力検証
+        # Input validation
         if not file_path or not file_path.strip():
             raise ValueError("File path cannot be empty")
 
-        # ファイル存在チェック
+        # File existence check
         if not Path(file_path).exists():
             raise FileNotFoundError(f"File not found: {file_path}")
 
         try:
-            # AnalysisRequestを作成
+            # Create AnalysisRequest
             request = AnalysisRequest(
                 file_path=file_path,
                 language=kwargs.get("language"),

tree_sitter_analyzer/interfaces/mcp_adapter.py

@@ -182,12 +182,12 @@ class MCPAdapter:
 
     async def analyze_with_mcp_request(
         self, arguments: dict[str, Any]
-    ) -> dict[str, Any]:
+    ) -> AnalysisResult:
         """Analyze with MCP request."""
         if "file_path" not in arguments:
             raise KeyError("file_path is required in MCP request")
         result = await self.analyze_file_async(arguments["file_path"])
-        return {"result": str(result), "success": True}
+        return result
 
 
 class MCPServerAdapter: