auto-coder 0.1.331__py3-none-any.whl → 0.1.333__py3-none-any.whl

autocoder/linters/reactjs_linter.py

@@ -207,22 +207,59 @@ class ReactJSLinter(BaseLinter):
         Returns:
             str: The extracted JSON string, or the original text if no separator is found.
         """
-        if "=============" in output_text:
-            lines = output_text.split('\n')
-            json_lines = []
-            found_separator = False
-            
-            for line in lines:
-                if line.startswith("============="):
-                    found_separator = True
-                    continue
-                if found_separator:
-                    json_lines.append(line)
+        return output_text.split("=============")[-1]
+    
+    def _convert_raw_lint_result_to_dict(self, raw_result: str,result: Dict[str, Any], project_path: str):        
+        try:
+            output_text = raw_result
+            eslint_output = []
+            try:
+                eslint_output = json.loads(output_text)
+            except json.JSONDecodeError:
+                # Try to extract JSON from output if it contains separator
+                json_text = self._extract_json_from_output(output_text)                
+                try:
+                        eslint_output = json.loads(json_text)
+                except json.JSONDecodeError:                           
+                    print(json_text[0:100],"...",json_text[-100:])              
             
-            if json_lines:
-                return '\n'.join(json_lines)
-        
-        return output_text
+            # print(f"eslint_output: {json.dumps(eslint_output, indent=4,ensure_ascii=False)}")
+
+            # Count files analyzed (should be 1)
+            result['files_analyzed'] = len(eslint_output)
+
+            # Track overall counts
+            total_errors = 0
+            total_warnings = 0
+
+            # Process the file result
+            for file_result in eslint_output:
+                file_rel_path = os.path.relpath(
+                    file_result['filePath'], project_path)
+
+                # Add error and warning counts
+                total_errors += file_result.get('errorCount', 0)
+                total_warnings += file_result.get('warningCount', 0)
+
+                # Process individual messages
+                for message in file_result.get('messages', []):
+                    issue = {
+                        'file': file_rel_path,
+                        'line': message.get('line', 0),
+                        'column': message.get('column', 0),
+                        'severity': 'error' if message.get('severity', 1) == 2 else 'warning',
+                        'message': message.get('message', ''),
+                        'rule': message.get('ruleId', 'unknown')
+                    }
+                    result['issues'].append(issue)
+
+            result['error_count'] = total_errors
+            result['warning_count'] = total_warnings
+            result['success'] = True
+        except json.JSONDecodeError:
+            # Handle case where ESLint output is not valid JSON
+            result['error'] = "Failed to parse ESLint output"
+
 
     def lint_file(self, file_path: str, fix: bool = False, project_path: str = None) -> Dict[str, Any]:
         """
@@ -296,51 +333,7 @@ class ReactJSLinter(BaseLinter):
 
             # Parse ESLint output
             if process.stdout:
-                try:
-                    output_text = process.stdout                    
-                    try:
-                        eslint_output = json.loads(output_text)
-                    except json.JSONDecodeError:
-                        # Try to extract JSON from output if it contains separator
-                        json_text = self._extract_json_from_output(output_text)
-                        eslint_output = json.loads(json_text)
-                    
-                    # print(f"eslint_output: {json.dumps(eslint_output, indent=4,ensure_ascii=False)}")
-
-                    # Count files analyzed (should be 1)
-                    result['files_analyzed'] = len(eslint_output)
-
-                    # Track overall counts
-                    total_errors = 0
-                    total_warnings = 0
-
-                    # Process the file result
-                    for file_result in eslint_output:
-                        file_rel_path = os.path.relpath(
-                            file_result['filePath'], project_path)
-
-                        # Add error and warning counts
-                        total_errors += file_result.get('errorCount', 0)
-                        total_warnings += file_result.get('warningCount', 0)
-
-                        # Process individual messages
-                        for message in file_result.get('messages', []):
-                            issue = {
-                                'file': file_rel_path,
-                                'line': message.get('line', 0),
-                                'column': message.get('column', 0),
-                                'severity': 'error' if message.get('severity', 1) == 2 else 'warning',
-                                'message': message.get('message', ''),
-                                'rule': message.get('ruleId', 'unknown')
-                            }
-                            result['issues'].append(issue)
-
-                    result['error_count'] = total_errors
-                    result['warning_count'] = total_warnings
-                    result['success'] = True
-                except json.JSONDecodeError:
-                    # Handle case where ESLint output is not valid JSON
-                    result['error'] = "Failed to parse ESLint output"
+                self._convert_raw_lint_result_to_dict(process.stdout, result, project_path)
             else:
                 # Handle case where ESLint didn't produce any output
                 stderr = process.stderr.strip()
@@ -577,4 +570,5 @@ def format_lint_result(lint_result: Dict[str, Any]) -> str:
         str: A formatted string representation of the lint results.
     """
     linter = ReactJSLinter()
-    return linter.format_lint_result(lint_result) 
+    return linter.format_lint_result(lint_result) 
+    

autocoder/linters/shadow_linter.py

@@ -16,6 +16,7 @@ from autocoder.linters.models import (
     IssuePosition, 
     IssueSeverity
 )
+from loguru import logger as global_logger
 
 class ShadowLinter:
     """
@@ -32,6 +33,7 @@ class ShadowLinter:
         """
         self.shadow_manager = shadow_manager
         self.verbose = verbose
+        self.logger = global_logger.bind(name="ShadowLinter")
         
     def lint_shadow_file(self, shadow_path: str, fix: bool = False) -> FileLintResult:
         """
@@ -117,8 +119,10 @@ class ShadowLinter:
         
         # 处理每个影子文件
         for shadow_path in shadow_files:
+            self.logger.info(f"正在检查文件: {shadow_path}")
             try:
                 file_result = self.lint_shadow_file(shadow_path, fix=fix)
+                self.logger.info(f"检查完成: {shadow_path}")
                 # lint_shadow_file现在总是返回有效的FileLintResult，不再需要检查None
                 project_path = self.shadow_manager.from_shadow_path(shadow_path)
                 

autocoder/shadows/shadow_manager.py

@@ -285,7 +285,7 @@ class ShadowManager:
             # 删除链接项目目录中的所有内容
             for item in os.listdir(self.link_projects_dir):
                 item_path = os.path.join(self.link_projects_dir, item)
-                if os.path.isfile(item_path):
+                if os.path.isfile(item_path) or os.path.islink(item_path):
                     os.unlink(item_path)
                 elif os.path.isdir(item_path):
                     shutil.rmtree(item_path)

autocoder/utils/project_structure.py

@@ -127,9 +127,9 @@ class EnhancedFileAnalyzer:
         return self._basic_analysis(extensions)
 
     def _collect_extensions(self) -> Set[str]:
-        """带过滤的文件后缀收集"""
+        """带过滤的文件后缀收集，支持软链接目录和文件"""
         extensions = set()
-        for root, dirs, files in os.walk(self.directory):
+        for root, dirs, files in os.walk(self.directory, followlinks=True):
             dirs[:] = [d for d in dirs if not self.file_filter.should_ignore(d, True)]
             for file in files:
                 if self.file_filter.should_ignore(file, False):

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.331"
+__version__ = "0.1.333"