create-prisma-php-app 1.11.9 → 1.11.11

package/dist/bootstrap.php

@@ -39,6 +39,16 @@ function determineContentToInclude()
             }
         }
 
+        if (empty($includePath)) {
+            $dynamicRoute = dynamicRoute($uri);
+            if ($dynamicRoute) {
+                $path = __DIR__ . $dynamicRoute;
+                if (file_exists($path)) {
+                    $includePath = $path;
+                }
+            }
+        }
+
         $currentPath = $baseDir;
         $getGroupFolder = getGroupFolder($groupFolder);
         $modifiedUri = $uri;
@@ -88,51 +98,9 @@ function uriExtractor(string $scriptUrl): string
     return "/";
 }
 
-function checkForDuplicateRoutes()
-{
-    $routes = json_decode(file_get_contents(SETTINGS_PATH . "/files-list.json"), true);
-
-    $normalizedRoutesMap = [];
-    foreach ($routes as $route) {
-        $routeWithoutGroups = preg_replace('/\(.*?\)/', '', $route);
-        $routeTrimmed = ltrim($routeWithoutGroups, '.\\/');
-        $routeTrimmed = preg_replace('#/{2,}#', '/', $routeTrimmed);
-        $routeTrimmed = preg_replace('#\\\\{2,}#', '\\', $routeTrimmed);
-        $routeNormalized = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $routeTrimmed);
-        $normalizedRoutesMap[$routeNormalized][] = $route;
-    }
-
-    $errorMessages = [];
-    foreach ($normalizedRoutesMap as $normalizedRoute => $originalRoutes) {
-        $basename = basename($normalizedRoute);
-        if ($basename === 'layout.php') continue;
-
-        if (count($originalRoutes) > 1 && strpos($normalizedRoute, DIRECTORY_SEPARATOR) !== false) {
-            $directGroupMatchFound = false;
-            foreach ($originalRoutes as $originalRoute) {
-                if (preg_match('~^\\.\\/src\\/app[\\/\\\\]\\(.*?\\)[\\/\\\\].*?\\.php$~', $originalRoute, $matches)) {
-                    $directGroupMatchFound = true;
-                }
-            }
-
-            if ($directGroupMatchFound) continue;
-
-            $errorMessages[] = "Duplicate route found after normalization: " . $normalizedRoute;
-
-            foreach ($originalRoutes as $originalRoute) {
-                $errorMessages[] = "- Grouped original route: " . $originalRoute;
-            }
-        }
-    }
-
-    if (!empty($errorMessages)) {
-        $errorMessageString = implode("<br>", $errorMessages);
-        modifyOutputLayoutForError($errorMessageString);
-    }
-}
-
 function writeRoutes()
 {
+    global $filesListRoutes;
     $directory = './src/app';
 
     if (is_dir($directory)) {
@@ -149,6 +117,10 @@ function writeRoutes()
         $jsonData = json_encode($filesList, JSON_PRETTY_PRINT);
         $jsonFileName = SETTINGS_PATH . '/files-list.json';
         @file_put_contents($jsonFileName, $jsonData);
+
+        if (file_exists($jsonFileName)) {
+            $filesListRoutes = json_decode(file_get_contents($jsonFileName), true);
+        }
     }
 }
 
@@ -171,6 +143,37 @@ function findGroupFolder($uri): string
     }
 }
 
+function dynamicRoute($uri)
+{
+    global $filesListRoutes;
+    $uriMatch = null;
+    $normalizedUri = ltrim(str_replace('\\', '/', $uri), './');
+    $normalizedUriEdited = "src/app/$normalizedUri/route.php";
+    $uriSegments = explode('/', $normalizedUriEdited);
+
+    foreach ($filesListRoutes as $route) {
+        $normalizedRoute = trim(str_replace('\\', '/', $route), '.');
+        $routeSegments = explode('/', ltrim($normalizedRoute, '/'));
+        $singleDynamic = preg_match_all('/\[[^\]]+\]/', $normalizedRoute, $matches) === 1 && !strpos($normalizedRoute, '[...');
+        if ($singleDynamic) {
+            if (singleDynamicRoute($uriSegments, $routeSegments)) {
+                $uriMatch = $normalizedRoute;
+                break;
+            }
+        } elseif (strpos($normalizedRoute, '[...') !== false) {
+            $cleanedRoute = preg_replace('/\[\.\.\..*?\].*/', '', $normalizedRoute);
+            if (strpos('/src/app/' . $normalizedUri, $cleanedRoute) === 0) {
+                if (strpos($normalizedRoute, 'route.php') !== false) {
+                    $uriMatch = $normalizedRoute;
+                    break;
+                }
+            }
+        }
+    }
+
+    return $uriMatch;
+}
+
 function isGroupIdentifier($segment): bool
 {
     return preg_match('/^\(.*\)$/', $segment);
@@ -178,15 +181,16 @@ function isGroupIdentifier($segment): bool
 
 function matchGroupFolder($constructedPath): ?string
 {
-    $routes = json_decode(file_get_contents(SETTINGS_PATH . "/files-list.json"), true);
+    global $filesListRoutes;
     $bestMatch = null;
     $normalizedConstructedPath = ltrim(str_replace('\\', '/', $constructedPath), './');
 
     $routeFile = "/src/app/$normalizedConstructedPath/route.php";
     $indexFile = "/src/app/$normalizedConstructedPath/index.php";
 
-    foreach ($routes as $route) {
+    foreach ($filesListRoutes as $route) {
         $normalizedRoute = trim(str_replace('\\', '/', $route), '.');
+
         $cleanedRoute = preg_replace('/\/\([^)]+\)/', '', $normalizedRoute);
         if ($cleanedRoute === $routeFile) {
             $bestMatch = $normalizedRoute;
@@ -211,10 +215,63 @@ function getGroupFolder($uri): string
     return "";
 }
 
-function redirect(string $url): void
+function singleDynamicRoute($uriSegments, $routeSegments)
+{
+    if (count($routeSegments) != count($uriSegments)) {
+        return false;
+    }
+
+    foreach ($routeSegments as $index => $segment) {
+        if (preg_match('/^\[[^\]]+\]$/', $segment)) {
+        } else {
+            if ($segment !== $uriSegments[$index]) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+function checkForDuplicateRoutes()
 {
-    header("Location: $url");
-    exit;
+    global $filesListRoutes;
+    $normalizedRoutesMap = [];
+    foreach ($filesListRoutes as $route) {
+        $routeWithoutGroups = preg_replace('/\(.*?\)/', '', $route);
+        $routeTrimmed = ltrim($routeWithoutGroups, '.\\/');
+        $routeTrimmed = preg_replace('#/{2,}#', '/', $routeTrimmed);
+        $routeTrimmed = preg_replace('#\\\\{2,}#', '\\', $routeTrimmed);
+        $routeNormalized = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $routeTrimmed);
+        $normalizedRoutesMap[$routeNormalized][] = $route;
+    }
+
+    $errorMessages = [];
+    foreach ($normalizedRoutesMap as $normalizedRoute => $originalRoutes) {
+        $basename = basename($normalizedRoute);
+        if ($basename === 'layout.php') continue;
+
+        if (count($originalRoutes) > 1 && strpos($normalizedRoute, DIRECTORY_SEPARATOR) !== false) {
+            $directGroupMatchFound = false;
+            foreach ($originalRoutes as $originalRoute) {
+                if (preg_match('~^\\.\\/src\\/app[\\/\\\\]\\(.*?\\)[\\/\\\\].*?\\.php$~', $originalRoute, $matches)) {
+                    $directGroupMatchFound = true;
+                }
+            }
+
+            if ($directGroupMatchFound) continue;
+
+            $errorMessages[] = "Duplicate route found after normalization: " . $normalizedRoute;
+
+            foreach ($originalRoutes as $originalRoute) {
+                $errorMessages[] = "- Grouped original route: " . $originalRoute;
+            }
+        }
+    }
+
+    if (!empty($errorMessages)) {
+        $errorMessageString = implode("<br>", $errorMessages);
+        modifyOutputLayoutForError($errorMessageString);
+    }
 }
 
 function setupErrorHandling(&$content)
@@ -240,9 +297,12 @@ function setupErrorHandling(&$content)
 }
 
 ob_start();
+require_once SETTINGS_PATH . '/public-functions.php';
 require_once SETTINGS_PATH . '/request-methods.php';
 $metadataArray = require_once APP_PATH . '/metadata.php';
+$filesListRoutes = [];
 $metadata = "";
+$uri = "";
 $pathname = "";
 $content = "";
 $childContent = "";
@@ -250,9 +310,12 @@ $childContent = "";
 function containsChildContent($filePath)
 {
     $fileContent = file_get_contents($filePath);
-    $pattern = '/<\?(?:php)?[^?]*\$childContent[^?]*\?>/is';
-
-    if (preg_match($pattern, $fileContent)) {
+    if (
+        (strpos($fileContent, 'echo $childContent') === false &&
+            strpos($fileContent, 'echo $childContent;') === false) &&
+        (strpos($fileContent, '<?= $childContent ?>') === false) &&
+        (strpos($fileContent, '<?= $childContent; ?>') === false)
+    ) {
         return true;
     } else {
         return false;
@@ -262,8 +325,12 @@ function containsChildContent($filePath)
 function containsContent($filePath)
 {
     $fileContent = file_get_contents($filePath);
-    $pattern = '/<\?(?:php\s+)?(?:=|echo|print)\s*\$content\s*;?\s*\?>/i';
-    if (preg_match($pattern, $fileContent)) {
+    if (
+        (strpos($fileContent, 'echo $content') === false &&
+            strpos($fileContent, 'echo $content;') === false) &&
+        (strpos($fileContent, '<?= $content ?>') === false) &&
+        (strpos($fileContent, '<?= $content; ?>') === false)
+    ) {
         return true;
     } else {
         return false;
@@ -300,8 +367,10 @@ try {
     $parentLayoutPath = APP_PATH . '/layout.php';
     $isParentLayout = !empty($layoutsToInclude) && strpos($layoutsToInclude[0], 'src/app/layout.php') !== false;
 
-    if (!containsContent($parentLayoutPath)) {
-        $content .= "<div class='error'>The parent layout file does not contain &lt;?php echo \$content ?&gt; Or &lt;?= \$content ?&gt;<br>" . "<strong>$parentLayoutPath</strong></div>";
+    $isContentIncluded = false;
+    $isChildContentIncluded = false;
+    if (containsContent($parentLayoutPath)) {
+        $isContentIncluded = true;
     }
 
     ob_start();
@@ -312,13 +381,16 @@ try {
             $childContent = ob_get_clean();
         }
         foreach (array_reverse($layoutsToInclude) as $layoutPath) {
-            ob_start();
-            if ($parentLayoutPath === $layoutPath) continue;
+            if ($parentLayoutPath === $layoutPath) {
+                continue;
+            }
+
             if (containsChildContent($layoutPath)) {
-                require_once $layoutPath;
-            } else {
-                $content .= "<div class='error'>The layout file does not contain &lt;?php echo \$childContent ?&gt; Or &lt;?= \$childContent ?&gt<br>" . "<strong>$layoutPath</strong></div>";
+                $isChildContentIncluded = true;
             }
+
+            ob_start();
+            require_once $layoutPath;
             $childContent = ob_get_clean();
         }
     } else {
@@ -333,11 +405,19 @@ try {
         $childContent = ob_get_clean();
     }
 
-    $content .= $childContent;
-
-    ob_start();
-    require_once APP_PATH . '/layout.php';
-    echo ob_get_clean();
+    if (!$isContentIncluded && !$isChildContentIncluded) {
+        $content .= $childContent;
+        ob_start();
+        require_once APP_PATH . '/layout.php';
+    } else {
+        if ($isContentIncluded) {
+            $content .= "<div class='error'>The parent layout file does not contain &lt;?php echo \$content; ?&gt; Or &lt;?= \$content ?&gt;<br>" . "<strong>$parentLayoutPath</strong></div>";
+            modifyOutputLayoutForError($content);
+        } else {
+            $content .= "<div class='error'>The layout file does not contain &lt;?php echo \$childContent; ?&gt; or &lt;?= \$childContent ?&gt;<br><strong>$layoutPath</strong></div>";
+            modifyOutputLayoutForError($content);
+        }
+    }
 } catch (Throwable $e) {
     $content = ob_get_clean();
     $content .=  "<div class='error'>Unhandled Exception: " . htmlspecialchars($e->getMessage(), ENT_QUOTES, 'UTF-8') . "</div>";

package/dist/settings/public-functions.php

@@ -0,0 +1,7 @@
+<?php
+
+function redirect(string $url): void
+{
+    header("Location: $url");
+    exit;
+}

package/dist/src/app/index.php

@@ -1,6 +1,6 @@
 <div class="flex flex-col min-h-[100vh]">
     <header class="px-4 lg:px-6 h-14 flex items-center">
-        <a class="flex items-center justify-center" href="#">
+        <a class="flex items-center justify-center" href="/">
             <img class="h-10 w-10" src="<?= $baseUrl ?>assets/images/prisma-php.png" alt="Prisma PHP">
             <span class="sr-only">Prisma PHP</span>
         </a>

package/package.json

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