refactoring

Author: tom-sapletta-com

whyml-converters/whyml_converters/html_converter.py

@@ -267,10 +267,30 @@ def _generate_internal_styles(self, styles: Dict[str, Any]) -> str:
                 if isinstance(value, dict):
                     css_rule = self._generate_css_rule(key, value)
                     css_parts.append(css_rule)
-                elif isinstance(value, str) and '{' in value and '}' in value:
-                    # Direct CSS string - substitute variables
-                    css_with_vars = self._substitute_css_variables(value, styles)
-                    css_parts.append(css_with_vars)
+                elif isinstance(value, str):
+                    css_text = value.strip()
+                    if '{' in css_text and '}' in css_text:
+                        # Full CSS block - substitute variables
+                        css_with_vars = self._substitute_css_variables(css_text, styles)
+                        css_parts.append(css_with_vars)
+                    elif ':' in css_text:
+                        # Treat as declaration list; build rule for selector
+                        # Prefix '.' for bare class-like selectors
+                        selector = key
+                        if not selector.startswith(('.', '#')):
+                            selector = f'.{selector}'
+                        # Parse declarations into dict
+                        properties = {}
+                        for decl in css_text.split(';'):
+                            decl = decl.strip()
+                            if not decl:
+                                continue
+                            if ':' in decl:
+                                prop, val = decl.split(':', 1)
+                                properties[prop.strip()] = val.strip()
+                        if properties:
+                            css_rule = self._generate_css_rule(selector, properties)
+                            css_parts.append(css_rule)
 
         if css_parts:
             css_content = '\n'.join(css_parts)

whyml-converters/whyml_converters/php_converter.py

@@ -47,15 +47,23 @@ def convert(self, manifest: Dict[str, Any], **kwargs):
         from .conversion_result import ConversionResult
         import asyncio
 
-        # Run async conversion
+        # Determine default class name from metadata title
+        metadata = manifest.get('metadata', {})
+        title = metadata.get('title', 'Component')
+        class_name_base = ''.join(ch for ch in title.title() if ch.isalnum()) or 'Component'
+        # Ensure suffix 'Component'
+        class_name = class_name_base if class_name_base.endswith('Component') else f"{class_name_base}Component"
+        
+        # Run async conversion with class_name passed through
         try:
             loop = asyncio.get_event_loop()
         except RuntimeError:
             loop = asyncio.new_event_loop()
             asyncio.set_event_loop(loop)
 
-        php_content = loop.run_until_complete(self.convert_manifest(manifest, **kwargs))
-        return ConversionResult(content=php_content, format="php")
+        php_content = loop.run_until_complete(self.convert_manifest(manifest, class_name=class_name, **kwargs))
+        filename = f"{class_name}.php"
+        return ConversionResult(content=php_content, format="php", filename=filename)
 
     async def convert_manifest(self, 
                               manifest: Dict[str, Any],
@@ -574,6 +582,21 @@ def _generate_php_utility_methods(self, **options) -> str:
         self._decrease_indent()
         utility_methods.append(f'{self._indent()}}}')
 
+        utility_methods.append("")
+        
+        # Data setter to demonstrate typed array parameter
+        utility_methods.append(f'{self._indent()}/**')
+        utility_methods.append(f'{self._indent()} * Set component data')
+        utility_methods.append(f'{self._indent()} * @param array $data Data array')
+        utility_methods.append(f'{self._indent()} * @return void')
+        utility_methods.append(f'{self._indent()} */')
+        utility_methods.append(f'{self._indent()}protected function setData(array $data): void')
+        utility_methods.append(f'{self._indent()}{{')
+        self._increase_indent()
+        utility_methods.append(f'{self._indent()}// In a full implementation, this would store $data for rendering')
+        self._decrease_indent()
+        utility_methods.append(f'{self._indent()}}}')
+        
         return '\n'.join(utility_methods)
 
     def _generate_php_helper_functions(self, **options) -> str: