refactoring

Author: tom-sapletta-com

.gitignore

@@ -7,7 +7,6 @@ artifacts/
 out/
 project.c2l.*
 project.func.*
-project.functions.*
 ollama_benchmark_results.csv
 *_benchmark_results.csv
 .idea

code2logic/cli.py

@@ -651,6 +651,11 @@ def _maybe_print_pretty_help() -> bool:
         action='store_true',
         help='Write all output to stdout instead of files (including schema and function-logic). Useful for piping.'
     )
+    parser.add_argument(
+        '--no-repeat-name',
+        action='store_true',
+        help='Reduce repeated directory prefixes in TOON outputs by using ./file for consecutive entries in the same folder (applies to function-logic TOON and TOON module lists).'
+    )
     parser.add_argument(
         '--no-install',
         action='store_true',
@@ -961,7 +966,11 @@ def _maybe_print_pretty_help() -> bool:
                 'standard': 'standard',
                 'full': 'full',
             }
-            output = generator.generate(project, detail=detail_map.get(args.detail, 'standard'))
+            output = generator.generate(
+                project,
+                detail=detail_map.get(args.detail, 'standard'),
+                no_repeat_name=args.no_repeat_name,
+            )
 
         # Generate schema if requested
         if args.with_schema:
@@ -1012,7 +1021,7 @@ def _maybe_print_pretty_help() -> bool:
         elif lower.endswith(('.yaml', '.yml')):
             logic_out = logic_gen.generate_yaml(project, detail=args.detail)
         elif lower.endswith('.toon'):
-            logic_out = logic_gen.generate_toon(project, detail=args.detail)
+            logic_out = logic_gen.generate_toon(project, detail=args.detail, no_repeat_name=args.no_repeat_name)
         else:
             logic_out = logic_gen.generate(project, detail=args.detail)
 

code2logic/function_logic.py

@@ -59,7 +59,7 @@ def generate_yaml(self, project: ProjectInfo, detail: str = 'full') -> str:
             return self.generate(project, detail)
         return yaml.dump(data, default_flow_style=False, allow_unicode=True, sort_keys=False, width=120)
 
-    def generate_toon(self, project: ProjectInfo, detail: str = 'full') -> str:
+    def generate_toon(self, project: ProjectInfo, detail: str = 'full', no_repeat_name: bool = False) -> str:
         if detail == 'detailed':
             detail = 'full'
         toon = TOONGenerator()
@@ -73,19 +73,31 @@ def generate_toon(self, project: ProjectInfo, detail: str = 'full') -> str:
 
         modules = list(project.modules or [])
         lines.append(f"modules[{len(modules)}]{{path{dm}lang{dm}items}}:")
+        prev_dir: str | None = None
         for m in modules:
             items = self._module_items(m)
-            lines.append(f"  {toon._quote(m.path)}{delim}{m.language}{delim}{len(items)}")
+            if no_repeat_name:
+                compressed_path, prev_dir = toon._compress_module_path(m.path, prev_dir)
+                path_out = compressed_path
+            else:
+                path_out = m.path
+            lines.append(f"  {toon._quote(path_out)}{delim}{toon._short_lang(m.language)}{delim}{len(items)}")
 
         lines.append("")
         lines.append("function_details:")
 
+        prev_dir = None
         for m in modules:
             items = self._module_items(m)
             if not items:
                 continue
 
-            lines.append(f"  {toon._quote(m.path)}:")
+            if no_repeat_name:
+                compressed_path, prev_dir = toon._compress_module_path(m.path, prev_dir)
+                details_key = compressed_path
+            else:
+                details_key = m.path
+            lines.append(f"  {toon._quote(details_key)}:")
 
             header = f"name{dm}kind{dm}sig{dm}loc{dm}async{dm}lines{dm}cc"
             if detail in ('standard', 'full'):

code2logic/toon_format.py

@@ -33,6 +33,37 @@ class TOONGenerator:
     SPECIAL_CHARS = re.compile(r'[:\"\\\[\]\{\}\n\t\r,]')
     LOOKS_LIKE_LITERAL = re.compile(r'^(true|false|null|-?\d+\.?\d*([eE][+-]?\d+)?|-)$')
 
+    LANGUAGE_ABBREVIATIONS = {
+        'python': 'py',
+        'javascript': 'js',
+        'typescript': 'ts',
+        'tsx': 'tsx',
+        'jsx': 'jsx',
+        'java': 'java',
+        'kotlin': 'kt',
+        'go': 'go',
+        'rust': 'rs',
+        'c': 'c',
+        'cpp': 'cpp',
+        'c++': 'cpp',
+        'csharp': 'cs',
+        'c#': 'cs',
+        'php': 'php',
+        'ruby': 'rb',
+        'swift': 'swift',
+        'scala': 'scala',
+        'bash': 'sh',
+        'shell': 'sh',
+        'sql': 'sql',
+        'yaml': 'yaml',
+        'json': 'json',
+        'toml': 'toml',
+        'markdown': 'md',
+        'html': 'html',
+        'css': 'css',
+        'dockerfile': 'docker',
+    }
+
     def __init__(self, delimiter: str = ',', use_tabs: bool = False):
         """
         Initialize TOON generator.
@@ -46,7 +77,27 @@ def __init__(self, delimiter: str = ',', use_tabs: bool = False):
         # parsers/LLMs can read them. Use comma-separated headers regardless of row delimiter.
         self.delim_marker = ','
 
-    def generate(self, project: ProjectInfo, detail: str = 'standard') -> str:
+    def _short_lang(self, lang: str) -> str:
+        lang_norm = (lang or '').strip().lower()
+        return self.LANGUAGE_ABBREVIATIONS.get(lang_norm, lang)
+
+    def _compress_module_path(self, path: str, prev_dir: str | None) -> tuple[str, str]:
+        """Compress repeated directory prefixes for module summary tables.
+
+        If consecutive modules are in the same directory, emit './<basename>' instead
+        of repeating '<dir>/<basename>'. The first entry for a directory stays as the
+        full path.
+        """
+        p = (path or '')
+        if '/' not in p:
+            return p, ''
+
+        cur_dir, base = p.rsplit('/', 1)
+        if prev_dir is not None and cur_dir == prev_dir:
+            return f"./{base}", cur_dir
+        return p, cur_dir
+
+    def generate(self, project: ProjectInfo, detail: str = 'standard', no_repeat_name: bool = False) -> str:
         """
         Generate TOON format from ProjectInfo.
 
@@ -71,26 +122,33 @@ def generate(self, project: ProjectInfo, detail: str = 'standard') -> str:
 
         # Languages as primitive array
         if project.languages:
-            lang_items = [f"{k}:{v}" for k, v in project.languages.items()]
+            lang_items = [f"{self._short_lang(k)}:{v}" for k, v in project.languages.items()]
             lines.append(f"  languages[{len(lang_items)}]: {self.delimiter.join(lang_items)}")
 
         # Modules - tabular format for efficiency
         if project.modules:
             lines.append("")
-            lines.extend(self._generate_modules(project.modules, detail))
+            lines.extend(self._generate_modules(project.modules, detail, no_repeat_name=no_repeat_name))
 
         return '\n'.join(lines)
 
-    def _generate_modules(self, modules: List[ModuleInfo], detail: str) -> List[str]:
+    def _generate_modules(self, modules: List[ModuleInfo], detail: str, no_repeat_name: bool = False) -> List[str]:
         """Generate modules section."""
         lines = []
 
         # Module summary as tabular array
         lines.append(f"modules[{len(modules)}]{{path{self.delim_marker}lang{self.delim_marker}lines{self.delim_marker}kb}}:")
+        prev_dir: str | None = None
         for m in modules:
-            path = self._quote(m.path)
+            if no_repeat_name:
+                path_out, prev_dir = self._compress_module_path(m.path, prev_dir)
+            else:
+                path_out = m.path
+            path = self._quote(path_out)
             kb = round((getattr(m, 'file_bytes', 0) or 0) / 1024, 1)
-            lines.append(f"  {path}{self.delimiter}{m.language}{self.delimiter}{m.lines_code}{self.delimiter}{kb}")
+            lines.append(
+                f"  {path}{self.delimiter}{self._short_lang(m.language)}{self.delimiter}{m.lines_code}{self.delimiter}{kb}"
+            )
 
         # Detailed module info
         if detail in ('standard', 'full'):