create-prisma-php-app 1.28.7 → 2.0.0-alpha.1

package/dist/src/Lib/ErrorHandler.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace Lib;
+
+use Bootstrap;
+use Lib\MainLayout;
+
+class ErrorHandler
+{
+    public static string $content = '';
+
+    public static function registerHandlers(): void
+    {
+        self::registerExceptionHandler();
+        self::registerShutdownFunction();
+        self::registerErrorHandler();
+    }
+
+    private static function registerExceptionHandler(): void
+    {
+        set_exception_handler(function ($exception) {
+            $errorContent = Bootstrap::isAjaxOrXFileRequestOrRouteFile()
+                ? "Exception: " . $exception->getMessage()
+                : "<div class='error'>Exception: " . htmlspecialchars($exception->getMessage(), ENT_QUOTES, 'UTF-8') . "</div>";
+
+            self::modifyOutputLayoutForError($errorContent);
+        });
+    }
+
+    private static function registerShutdownFunction(): void
+    {
+        register_shutdown_function(function () {
+            $error = error_get_last();
+            if (
+                $error !== null &&
+                in_array($error['type'], [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_RECOVERABLE_ERROR], true)
+            ) {
+                $errorContent = Bootstrap::isAjaxOrXFileRequestOrRouteFile()
+                    ? "Fatal Error: " . $error['message'] . " in " . $error['file'] . " on line " . $error['line']
+                    : "<div class='error'>Fatal Error: " . htmlspecialchars($error['message'], ENT_QUOTES, 'UTF-8') .
+                    " in " . htmlspecialchars($error['file'], ENT_QUOTES, 'UTF-8') .
+                    " on line " . $error['line'] . "</div>";
+
+                self::modifyOutputLayoutForError($errorContent);
+            }
+        });
+    }
+
+    private static function registerErrorHandler(): void
+    {
+        set_error_handler(function ($severity, $message, $file, $line) {
+            if (!(error_reporting() & $severity)) {
+                return;
+            }
+            $errorContent = Bootstrap::isAjaxOrXFileRequestOrRouteFile()
+                ? "Error: {$severity} - {$message} in {$file} on line {$line}"
+                : "<div class='error'>Error: {$message} in {$file} on line {$line}</div>";
+
+            if ($severity === E_WARNING || $severity === E_NOTICE) {
+                self::modifyOutputLayoutForError($errorContent);
+            }
+        });
+    }
+
+    public static function checkFatalError(): void
+    {
+        $error = error_get_last();
+        if (
+            $error !== null &&
+            in_array($error['type'], [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_RECOVERABLE_ERROR], true)
+        ) {
+            $errorContent = Bootstrap::isAjaxOrXFileRequestOrRouteFile()
+                ? "Fatal Error: " . $error['message'] . " in " . $error['file'] . " on line " . $error['line']
+                : "<div class='error'>Fatal Error: " . htmlspecialchars($error['message'], ENT_QUOTES, 'UTF-8') .
+                " in " . htmlspecialchars($error['file'], ENT_QUOTES, 'UTF-8') .
+                " on line " . $error['line'] . "</div>";
+
+            self::modifyOutputLayoutForError($errorContent);
+        }
+    }
+
+    public static function modifyOutputLayoutForError($contentToAdd): void
+    {
+        $errorFile = APP_PATH . '/error.php';
+        $errorFileExists = file_exists($errorFile);
+
+        if ($_ENV['SHOW_ERRORS'] === "false") {
+            if ($errorFileExists) {
+                $contentToAdd = Bootstrap::isAjaxOrXFileRequestOrRouteFile() ? "An error occurred" : "<div class='error'>An error occurred</div>";
+            } else {
+                exit;
+            }
+        }
+
+        if ($errorFileExists) {
+            self::$content = $contentToAdd;
+            if (Bootstrap::isAjaxOrXFileRequestOrRouteFile()) {
+                header('Content-Type: application/json');
+                echo json_encode(['success' => false, 'error' => self::$content]);
+                http_response_code(403);
+            } else {
+                $layoutFile = APP_PATH . '/layout.php';
+                if (file_exists($layoutFile)) {
+                    ob_start();
+                    require_once $errorFile;
+                    MainLayout::$children = ob_get_clean();
+                    require $layoutFile;
+                } else {
+                    echo self::$content;
+                }
+            }
+        } else {
+            if (Bootstrap::isAjaxOrXFileRequestOrRouteFile()) {
+                header('Content-Type: application/json');
+                echo json_encode(['success' => false, 'error' => $contentToAdd]);
+                http_response_code(403);
+            } else {
+                echo $contentToAdd;
+            }
+        }
+        exit;
+    }
+}

package/dist/src/Lib/MainLayout.php

@@ -10,6 +10,7 @@ class MainLayout
     public static string $description = '';
     public static string $children = '';
     public static string $childLayoutChildren = '';
+    public static string $html = '';
 
     private static array $headScripts = [];
     private static array $headScriptsMap = [];
@@ -54,33 +55,35 @@ class MainLayout
     }
 
     /**
-     * Output all the head scripts
+     * Generate all the head scripts with dynamic attributes.
      *
-     * @return void
+     * @return string
      */
-    public static function outputHeadScripts(): void
+    public static function outputHeadScripts(): string
     {
         $headScriptsWithAttributes = array_map(function ($tag) {
-            // Check if the tag is a <link> or <script> and add the dynamic attribute
+            // Check if the tag is a <script>, <link>, or <style> and add the dynamic attribute
             if (strpos($tag, '<script') !== false) {
                 return str_replace('<script', '<script pp-dynamic-script="81D7D"', $tag);
             } elseif (strpos($tag, '<link') !== false) {
                 return str_replace('<link', '<link pp-dynamic-link="81D7D"', $tag);
+            } elseif (strpos($tag, '<style') !== false) {
+                return str_replace('<style', '<style pp-dynamic-style="81D7D"', $tag);
             }
-            return $tag; // Return the tag unchanged if it's neither <script> nor <link>
+            return $tag;
         }, self::$headScripts);
 
-        echo implode("\n", $headScriptsWithAttributes);
+        return implode("\n", $headScriptsWithAttributes);
     }
 
     /**
-     * Output all the footer scripts
+     * Generate all the footer scripts.
      *
-     * @return void
+     * @return string
      */
-    public static function outputFooterScripts(): void
+    public static function outputFooterScripts(): string
     {
-        echo implode("\n", self::$footerScripts);
+        return implode("\n", self::$footerScripts);
     }
 
     /**
@@ -127,29 +130,27 @@ class MainLayout
     }
 
     /**
-     * Output the metadata as meta tags for the head section
+     * Generate the metadata as meta tags for the head section.
      *
-     * @return void
+     * @return string
      */
-    public static function outputMetadata(): void
+    public static function outputMetadata(): string
     {
-        // Output standard metadata
-        echo '<title>' . htmlspecialchars(self::$title) . '</title>' . "\n";
+        $metadataContent = [
+            '<meta charset="UTF-8">',
+            '<meta name="viewport" content="width=device-width, initial-scale=1.0">',
+        ];
+        $metadataContent[] = '<title>' . htmlspecialchars(self::$title) . '</title>';
 
-        // Ensure the description is included in custom metadata if not already present
         if (!isset(self::$customMetadata['description'])) {
             self::$customMetadata['description'] = self::$description;
         }
 
-        $customMetadataContent = [];
         foreach (self::$customMetadata as $key => $value) {
-            // Add the dynamic meta ID attribute to each <meta> tag
-            $customMetadataContent[] = '<meta name="' . htmlspecialchars($key) . '" content="' . htmlspecialchars($value) . '" pp-dynamic-meta="81D7D">';
+            $metadataContent[] = '<meta name="' . htmlspecialchars($key) . '" content="' . htmlspecialchars($value) . '" pp-dynamic-meta="81D7D">';
         }
 
-        if (!empty($customMetadataContent)) {
-            echo implode("\n", $customMetadataContent) . "\n";
-        }
+        return implode("\n", $metadataContent);
     }
 
     /**

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

@@ -5,10 +5,12 @@ declare(strict_types=1);
 namespace Lib\PHPX;
 
 use Lib\PrismaPHPSettings;
+use Lib\MainLayout;
 use DOMDocument;
 use DOMElement;
 use DOMComment;
 use DOMNode;
+use RuntimeException;
 
 class TemplateCompiler
 {
@@ -38,12 +40,9 @@ class TemplateCompiler
             self::initializeClassMappings();
         }
 
-        // Convert template to valid XML
         $dom = self::convertToXml($templateContent);
 
-        // Process the converted XML
         $root = $dom->documentElement;
-        $output = "";
 
         $outputParts = [];
         foreach ($root->childNodes as $child) {
@@ -53,25 +52,61 @@ class TemplateCompiler
         return implode('', $outputParts);
     }
 
-    public static function convertToXml(string $templateContent): DOMDocument
+    public static function injectDynamicContent(string $htmlContent): string
     {
-        // Escape `&` characters that are not part of valid XML entities
-        $templateContent = preg_replace_callback(
+        $patternHeadOpen = '/(<head\b[^>]*>)/i';
+        if (preg_match($patternHeadOpen, $htmlContent)) {
+            $htmlContent = preg_replace(
+                $patternHeadOpen,
+                '$1' . MainLayout::outputMetadata(),
+                $htmlContent,
+                1
+            );
+        }
+
+        $patternHeadClose = '/(<\/head\s*>)/i';
+        if (preg_match($patternHeadClose, $htmlContent)) {
+            $htmlContent = preg_replace(
+                $patternHeadClose,
+                MainLayout::outputHeadScripts() . '$1',
+                $htmlContent,
+                1
+            );
+        }
+
+        $patternBodyClose = '/(<\/body\s*>)/i';
+        if (preg_match($patternBodyClose, $htmlContent)) {
+            $htmlContent = preg_replace(
+                $patternBodyClose,
+                MainLayout::outputFooterScripts() . '$1',
+                $htmlContent,
+                1
+            );
+        }
+
+        return $htmlContent;
+    }
+
+    private static function escapeAmpersands(string $content): string
+    {
+        return preg_replace_callback(
             '/&(.*?)/',
             function ($matches) {
                 $str = $matches[0];
 
-                // If it already looks like a valid entity, leave it alone.
-                // This check can be as simple or as robust as you need.
                 if (preg_match('/^&(?:[a-zA-Z]+|#[0-9]+|#x[0-9A-Fa-f]+);$/', $str)) {
                     return $str;
                 }
 
-                // Otherwise, escape it.
                 return '&amp;' . substr($str, 1);
             },
-            $templateContent
+            $content
         );
+    }
+
+    public static function convertToXml(string $templateContent): DOMDocument
+    {
+        $templateContent = self::escapeAmpersands($templateContent);
 
         $dom = new DOMDocument();
         libxml_use_internal_errors(true);
@@ -80,7 +115,7 @@ class TemplateCompiler
 
         if (!$dom->loadXML($wrappedContent)) {
             $errors = self::getXmlErrors();
-            throw new \RuntimeException(
+            throw new RuntimeException(
                 "XML Parsing Failed: " . implode("; ", $errors)
             );
         }
@@ -112,7 +147,6 @@ class TemplateCompiler
             default => "Unknown",
         };
 
-        // Highlight the tag name in the error message
         $message = trim($error->message);
         if (preg_match("/tag (.*?) /", $message, $matches)) {
             $tag = $matches[1];
@@ -134,29 +168,23 @@ class TemplateCompiler
             $componentName = $node->nodeName;
             $attributes = [];
 
-            // Gather element attributes
             foreach ($node->attributes as $attr) {
                 $attributes[$attr->name] = $attr->value;
             }
 
-            // Recursively get child content
             $childOutput = [];
             foreach ($node->childNodes as $child) {
                 $childOutput[] = self::processNode($child);
             }
             $innerContent = implode('', $childOutput);
 
-            // We'll store 'children' for potential component logic
             $attributes['children'] = $innerContent;
 
-            // Pass to processComponent for final decision
             return self::processComponent($componentName, $attributes);
         } elseif ($node instanceof DOMComment) {
-            // Preserve HTML comments
             return "<!--{$node->textContent}-->";
         }
 
-        // For text/cdata nodes, return text
         return $node->textContent;
     }
 
@@ -173,18 +201,15 @@ class TemplateCompiler
             $className = self::$classMappings[$componentName]['className'];
             $filePath = self::$classMappings[$componentName]['filePath'];
 
-            // Ensure the required file is included
             require_once str_replace('\\', '/', SRC_PATH . '/' . $filePath);
 
             if (!class_exists($className)) {
-                throw new \RuntimeException("Class $className does not exist.");
+                throw new RuntimeException("Class $className does not exist.");
             }
 
-            // Instantiate the component
             $componentInstance = new $className($attributes);
             $renderedContent = $componentInstance->render();
 
-            // re-compile to handle further components
             if (strpos($renderedContent, '<') !== false) {
                 return self::compile($renderedContent);
             }
@@ -198,12 +223,10 @@ class TemplateCompiler
     {
         $attrs = self::renderAttributes($attributes);
 
-        // Check if it's self-closing
         if (in_array(strtolower($tagName), self::$selfClosingTags)) {
             return "<{$tagName}{$attrs} />";
         }
 
-        // Normal open/close
         $innerContent = $attributes['children'] ?? '';
         return "<{$tagName}{$attrs}>{$innerContent}</{$tagName}>";
     }

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

@@ -18,7 +18,7 @@ class TwMerge
         "px" => "/^px-/",
         "py" => "/^py-/",
 
-        // **Margin classes (similar logic)**
+        // **Margin classes**
         "m" => "/^m-/",
         "mt" => "/^mt-/",
         "mr" => "/^mr-/",
@@ -74,6 +74,9 @@ class TwMerge
         // **Flexbox alignment classes**
         "justify" => "/^justify-(start|end|center|between|around|evenly)$/",
 
+        // **Flexbox alignment classes**
+        "items" => "/^items-(start|end|center|baseline|stretch)$/",
+
         // **Width classes**
         "w" => "/^w-(full|[0-9]+|\\[.+\\])$/",
 
@@ -126,6 +129,9 @@ class TwMerge
         // **Flexbox alignment conflict group**
         "justify" => ["justify"],
 
+        // **Flexbox alignment conflict group**
+        "items" => ["items"],
+
         // **Width conflict group**
         "w" => ["w"],