create-prisma-php-app 3.0.0-beta.2 → 3.0.0-beta.4

package/dist/src/Lib/IncludeTracker.php

@@ -17,10 +17,10 @@ class IncludeTracker
     /**
      * Includes and echoes a file wrapped in a unique pp-section-id container.
      * Supported $mode values: 'include', 'include_once', 'require', 'require_once'
-     * 
+     *
      * @param string $filePath The path to the file to be included.
-     * @param string $mode The mode of inclusion. Can be 'include', 'include_once', 'require', or 'require_once'.
-     * @throws RuntimeException If the file does not exist.
+     * @param string $mode     The mode of inclusion.
+     * @throws RuntimeException        If the file does not exist.
      * @throws InvalidArgumentException If an invalid mode is provided.
      * @return void
      */
@@ -36,20 +36,16 @@ class IncludeTracker
             'include_once'  => include_once $filePath,
             'require'       => require $filePath,
             'require_once'  => require_once $filePath,
-            default         => throw new InvalidArgumentException("Invalid include mode: $mode")
+            default         => throw new InvalidArgumentException("Invalid include mode: $mode"),
         };
         $html = ob_get_clean();
 
-        $wrapped = self::wrapWithId($filePath, $html);
-
-        $fragDom = TemplateCompiler::convertToXml($wrapped, false);
+        $wrapped  = self::wrapWithId($filePath, $html);
+        $fragDom  = TemplateCompiler::convertToXml($wrapped, false);
 
         self::prefixInlineHandlers($fragDom);
 
-        $newHtml = '';
-        foreach ($fragDom->documentElement->childNodes as $c) {
-            $newHtml .= $fragDom->saveXML($c);
-        }
+        $newHtml = TemplateCompiler::innerXml($fragDom);
 
         self::$sections[$filePath] = [
             'path' => $filePath,
@@ -62,7 +58,6 @@ class IncludeTracker
     private static function wrapWithId(string $filePath, string $html): string
     {
         $id = 's' . base_convert(sprintf('%u', crc32($filePath)), 10, 36);
-
         return "<div pp-section-id=\"$id\">\n$html\n</div>";
     }
 

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

@@ -121,21 +121,6 @@ class PHPX implements IPHPX
             array_flip(array_merge($reserved, $exclude))
         );
 
-        $props = array_combine(
-            array_map('strtolower', array_keys($props)),
-            $props
-        );
-
-        foreach ($props as $key => $val) {
-            if (str_starts_with($key, 'on')) {
-                $event = substr($key, 2);
-                if (in_array($event, PrismaPHPSettings::$htmlEvents, true) && trim((string)$val) !== '') {
-                    $props["pp-original-on{$event}"] = (string)$val;
-                }
-                unset($props[$key]);
-            }
-        }
-
         foreach ($params as $k => $v) {
             $props[$k] = $v;
         }

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

@@ -169,6 +169,28 @@ class TemplateCompiler
         return $dom;
     }
 
+    /**
+     * Extracts the inner XML of a DOMNode, including all child nodes.
+     *
+     * @param DOMNode $node The node from which to extract the inner XML.
+     * @return string The inner XML as a string.
+     */
+    public static function innerXml(DOMNode $node): string
+    {
+        if ($node instanceof DOMDocument) {
+            $node = $node->documentElement;
+        }
+
+        /** @var DOMDocument $doc */
+        $doc  = $node->ownerDocument;
+
+        $html = '';
+        foreach ($node->childNodes as $child) {
+            $html .= $doc->saveXML($child);
+        }
+        return $html;
+    }
+
     protected static function getXmlErrors(): array
     {
         $errors = libxml_get_errors();
@@ -283,25 +305,24 @@ class TemplateCompiler
         string $componentName,
         array $incomingProps
     ): string {
-        $mapping  = self::selectComponentMapping($componentName);
-        $instance = self::initializeComponentInstance($mapping, $incomingProps);
+        $incomingProps = self::sanitizeIncomingProps($incomingProps);
+        $mapping       = self::selectComponentMapping($componentName);
+        $instance      = self::initializeComponentInstance($mapping, $incomingProps);
 
         $childHtml = '';
         foreach ($node->childNodes as $c) {
             $childHtml .= self::processNode($c);
         }
+        $instance->children = self::sanitizeEventAttributes($childHtml);
 
-        $childHtml = self::sanitizeEventAttributes($childHtml);
-        $instance->children = $childHtml;
-
-        $baseId = 's' . base_convert(sprintf('%u', crc32($mapping['className'])), 10, 36);
-        $idx    = self::$componentInstanceCounts[$baseId] ?? 0;
+        $baseId   = 's' . base_convert(sprintf('%u', crc32($mapping['className'])), 10, 36);
+        $idx      = self::$componentInstanceCounts[$baseId] ?? 0;
         self::$componentInstanceCounts[$baseId] = $idx + 1;
         $sectionId = $idx === 0 ? $baseId : "{$baseId}{$idx}";
 
-        $html = $instance->render();
-        $fragDom = self::convertToXml($html, false);
-        $xpath   = new DOMXPath($fragDom);
+        $html     = $instance->render();
+        $fragDom  = self::convertToXml($html, false);
+        $xpath    = new DOMXPath($fragDom);
 
         /** @var DOMElement $el */
         foreach ($xpath->query('//*') as $el) {
@@ -319,14 +340,11 @@ class TemplateCompiler
                 $value = $attr->value;
 
                 if (str_starts_with($name, 'pp-original-')) {
-                    $origName = substr($name, strlen('pp-original-'));
-                    $originalEvents[$origName] = $value;
+                    $origName                   = substr($name, strlen('pp-original-'));
+                    $originalEvents[$origName]  = $value;
                 } elseif (str_starts_with($name, 'on')) {
                     $event = substr($name, 2);
-                    if (
-                        in_array($event, PrismaPHPSettings::$htmlEvents, true)
-                        && trim((string)$value) !== ''
-                    ) {
+                    if ($value !== '' && in_array($event, PrismaPHPSettings::$htmlEvents, true)) {
                         $componentEvents[$name] = $value;
                     }
                 }
@@ -336,18 +354,10 @@ class TemplateCompiler
             foreach (array_keys($componentEvents) as $k) $el->removeAttribute($k);
 
             foreach ($componentEvents as $evAttr => $compValue) {
-
-                $el->setAttribute(
-                    "data-pp-child-{$evAttr}",
-                    $compValue
-                );
+                $el->setAttribute("data-pp-child-{$evAttr}", $compValue);
 
                 if (isset($originalEvents[$evAttr])) {
-                    $parentValue = $originalEvents[$evAttr];
-                    $el->setAttribute(
-                        "data-pp-parent-{$evAttr}",
-                        $parentValue
-                    );
+                    $el->setAttribute("data-pp-parent-{$evAttr}", $originalEvents[$evAttr]);
                     unset($originalEvents[$evAttr]);
                 }
             }
@@ -365,11 +375,7 @@ class TemplateCompiler
             }
         }
 
-        $htmlOut = '';
-        foreach ($root->childNodes as $child) {
-            $htmlOut .= $fragDom->saveXML($child);
-        }
-
+        $htmlOut = self::innerXml($fragDom);
         if (
             str_contains($htmlOut, '{{') ||
             self::hasComponentTag($htmlOut) ||
@@ -381,9 +387,24 @@ class TemplateCompiler
         return $htmlOut;
     }
 
+    protected static function sanitizeIncomingProps(array $props): array
+    {
+        foreach ($props as $key => $val) {
+            if (str_starts_with($key, 'on')) {
+                $event = substr($key, 2);
+                if (in_array($event, PrismaPHPSettings::$htmlEvents, true) && trim((string)$val) !== '') {
+                    $props["pp-original-on{$event}"] = (string)$val;
+                    unset($props[$key]);
+                }
+            }
+        }
+
+        return $props;
+    }
+
     protected static function sanitizeEventAttributes(string $html): string
     {
-        $fragDom = TemplateCompiler::convertToXml($html, false);
+        $fragDom = self::convertToXml($html, false);
         $xpath   = new DOMXPath($fragDom);
 
         /** @var DOMElement $el */
@@ -391,31 +412,26 @@ class TemplateCompiler
             foreach (iterator_to_array($el->attributes) as $attr) {
                 $name = strtolower($attr->name);
 
-                if (str_starts_with($name, 'on')) {
-                    $event = substr($name, 2);
-                    $value = trim($attr->value);
+                if (!str_starts_with($name, 'on')) {
+                    continue;
+                }
 
-                    if (
-                        $value !== '' &&
-                        in_array($event, PrismaPHPSettings::$htmlEvents, true)
-                    ) {
-                        $el->setAttribute("pp-original-on{$event}", $value);
-                    }
+                $event = substr($name, 2);
+                $value = trim($attr->value);
 
-                    $el->removeAttribute($name);
+                if ($value !== '' && in_array($event, PrismaPHPSettings::$htmlEvents, true)) {
+                    $el->setAttribute("pp-original-on{$event}", $value);
                 }
+
+                $el->removeAttribute($name);
             }
         }
 
-        /** @var DOMDocument $doc */
-        $doc  = $fragDom;
-        $body = $doc->getElementsByTagName('body')[0] ?? $doc;
+        $body = $fragDom->getElementsByTagName('body')[0] ?? null;
 
-        $html = '';
-        foreach ($body->childNodes as $child) {
-            $html .= $doc->saveHTML($child);
-        }
-        return $html;
+        return $body instanceof DOMElement
+            ? self::innerXml($body)
+            : self::innerXml($fragDom);
     }
 
     private static function selectComponentMapping(string $componentName): array

package/package.json

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