create-prisma-php-app 1.11.10 → 1.11.12

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,56 @@ 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) {
+            if ($basename !== 'route.php' && $basename !== 'index.php') 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 +290,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 = "";

package/dist/settings/public-functions.php

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

package/package.json

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