create-prisma-php-app 1.26.530 → 1.26.532

package/dist/src/Lib/PHPX/PHPX.php

@@ -22,6 +22,11 @@ class PHPX implements IPHPX
      */
     protected string $class;
 
+    /**
+     * @var array<string, mixed> The array representation of the HTML attributes.
+     */
+    protected array $attributesArray = [];
+
     /**
      * Constructor to initialize the component with the given properties.
      * 
@@ -67,25 +72,40 @@ class PHPX implements IPHPX
     /**
      * Generates and returns a string of HTML attributes from the provided props.
      * Excludes 'class' and 'children' props from being added as attributes.
-     * 
-     * @return string The generated HTML attributes.
+     * Prioritizes attributes from `$this->props` if duplicates are found in `$params`.
+     *
+     * @param array $params Optional additional attributes to merge with props.
+     *
+     * @return string The generated HTML attributes as a space-separated string.
      */
-    protected function getAttributes(): string
+    protected function getAttributes(array $params = []): string
     {
         // Filter out 'class' and 'children' props
-        $filteredProps = array_filter($this->props, function ($key) {
-            return !in_array($key, ['class', 'children']);
-        }, ARRAY_FILTER_USE_KEY);
-
-        // Build attributes string by escaping keys and values
-        $attributes = [];
-        foreach ($filteredProps as $key => $value) {
-            $escapedKey = htmlspecialchars($key, ENT_QUOTES, 'UTF-8');
-            $escapedValue = htmlspecialchars((string) $value, ENT_QUOTES, 'UTF-8');
-            $attributes[] = "$escapedKey='$escapedValue'";
+        $filteredProps = array_filter(
+            $this->props,
+            function ($key) {
+                return !in_array($key, ["class", "children"]);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+
+        // Merge attributes, prioritizing props in case of duplicates
+        $attributes = array_merge($params, $filteredProps);
+
+        // Build the attributes string by escaping keys and values
+        $attributeStrings = [];
+        foreach ($attributes as $key => $value) {
+            $escapedKey = htmlspecialchars($key, ENT_QUOTES, "UTF-8");
+            $escapedValue = htmlspecialchars(
+                (string) $value,
+                ENT_QUOTES,
+                "UTF-8"
+            );
+            $attributeStrings[] = "$escapedKey='$escapedValue'";
         }
 
-        return implode(' ', $attributes);
+        $this->attributesArray = $attributes;
+        return implode(" ", $attributeStrings);
     }
 
     /**

package/dist/src/Lib/PHPX/TemplateCompiler.php

@@ -37,6 +37,25 @@ class TemplateCompiler
             self::initializeClassMappings();
         }
 
+        // Convert template to valid XML
+        $dom = self::convertToXml($templateContent);
+
+        // Process the converted XML
+        $root = $dom->documentElement;
+        $output = "";
+
+        foreach ($root->childNodes as $child) {
+            $output .= self::processNode($child);
+        }
+
+        return $output;
+    }
+
+    public static function convertToXml(string $templateContent): DOMDocument
+    {
+        // Escape `&` characters that are not part of valid XML entities
+        $templateContent = preg_replace('/&(?![a-zA-Z0-9#]+;)/', '&', $templateContent);
+
         $dom = new DOMDocument();
         libxml_use_internal_errors(true);
 
@@ -50,13 +69,7 @@ class TemplateCompiler
         }
         libxml_clear_errors();
 
-        $root = $dom->documentElement;
-        $output = "";
-        foreach ($root->childNodes as $child) {
-            $output .= self::processNode($child);
-        }
-
-        return $output;
+        return $dom;
     }
 
     protected static function getXmlErrors(): array
@@ -163,7 +176,18 @@ class TemplateCompiler
             $classPath = self::$classMappings[$componentName];
             // Instantiate the component
             $componentInstance = new $classPath($attributes);
-            return $componentInstance->render();
+
+            // Render the component
+            $renderedContent = $componentInstance->render();
+
+            // Check if the rendered content contains other components
+            if (strpos($renderedContent, '<') !== false) {
+                // Re-parse the rendered content
+                return self::compile($renderedContent);
+            }
+
+            // Return the plain rendered content if no components are detected
+            return $renderedContent;
         } else {
             // Render as an HTML tag
             $attributesString = self::renderAttributes($attributes);

package/dist/src/Lib/PHPX/TwMerge.php

@@ -30,15 +30,15 @@ class TwMerge
         // **Background color classes**
         "bg" => "/^bg-/",
 
-        // **Text size classes**
+        // **Text size classes
         "text-size" => '/^text-(xs|sm|base|lg|xl|[2-9]xl)$/',
 
-        // **Text color classes**
-        "text-color" => '/^text-(?!xs$|sm$|base$|lg$|xl$|[2-9]xl$).+$/',
-
         // **Text alignment classes**
         "text-alignment" => '/^text-(left|center|right|justify)$/',
 
+        // **Text color classes
+        "text-color" => '/^text-(?!xs$|sm$|base$|lg$|xl$|[2-9]xl$).+$/',
+
         // **Text transform classes**
         "text-transform" =>
         '/^text-(uppercase|lowercase|capitalize|normal-case)$/',
@@ -71,6 +71,9 @@ class TwMerge
         // **Opacity classes
         "opacity" => '/^opacity(-[0-9]+)?$/',
 
+        // **Flexbox alignment classes**
+        "justify" => "/^justify-(start|end|center|between|around|evenly)$/",
+
         // **Other utility classes can be added here**
     ];
 
@@ -117,6 +120,9 @@ class TwMerge
         // **Opacity conflict group
         "opacity" => ["opacity"],
 
+        // **Flexbox alignment conflict group**
+        "justify" => ["justify"],
+
         // **Add other conflict groups as needed**
     ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma-php-app",
-  "version": "1.26.530",
+  "version": "1.26.532",
   "description": "Prisma-PHP: A Revolutionary Library Bridging PHP with Prisma ORM",
   "main": "dist/index.js",
   "type": "module",