create-prisma-php-app 1.11.543 → 1.11.600

package/composer.json

@@ -17,6 +17,7 @@
     "php": "^8.1",
     "vlucas/phpdotenv": "^5.6@dev",
     "firebase/php-jwt": "dev-main",
-    "phpmailer/phpmailer": "^6.9"
+    "phpmailer/phpmailer": "^6.9",
+    "guzzlehttp/guzzle": "7.8"
   }
 }

package/dist/bootstrap.php

@@ -15,12 +15,10 @@ $dotenv->load();
 
 function determineContentToInclude()
 {
-    $subject = $_SERVER["SCRIPT_NAME"];
-    $dirname = dirname($subject);
-    $requestUri = explode('?', $_SERVER['REQUEST_URI'], 2)[0];
-    $requestUri = rtrim($requestUri, '/');
-    $requestUri = str_replace($dirname, '', $requestUri);
-    $uri = trim($requestUri, '/');
+    $scriptUrl = $_SERVER['REQUEST_URI'];
+    $scriptUrl = explode('?', $scriptUrl, 2)[0];
+    $uri = $_SERVER['SCRIPT_URL'] ?? uriExtractor($scriptUrl);
+    $uri = ltrim($uri, '/');
     $baseDir = APP_PATH;
     $includePath = '';
     $layoutsToInclude = [];
@@ -41,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;
@@ -69,51 +77,30 @@ function determineContentToInclude()
     return ['path' => $includePath, 'layouts' => $layoutsToInclude, 'uri' => $uri];
 }
 
-function checkForDuplicateRoutes()
+function uriExtractor(string $scriptUrl): string
 {
-    $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;
+    $prismaPHPSettings = json_decode(file_get_contents("prisma-php.json"), true);
+    $projectName = $prismaPHPSettings['projectName'] ?? '';
+    if (empty($projectName)) {
+        return "/";
     }
 
-    $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;
-            }
+    $escapedIdentifier = preg_quote($projectName, '/');
+    $pattern = "/(?:.*$escapedIdentifier)(\/.*)$/";
+    if (preg_match($pattern, $scriptUrl, $matches)) {
+        if (!empty($matches[1])) {
+            $leftTrim = ltrim($matches[1], '/');
+            $rightTrim = rtrim($leftTrim, '/');
+            return "$rightTrim";
         }
     }
 
-    if (!empty($errorMessages)) {
-        $errorMessageString = implode("<br>", $errorMessages);
-        modifyOutputLayoutForError($errorMessageString);
-    }
+    return "/";
 }
 
 function writeRoutes()
 {
+    global $filesListRoutes;
     $directory = './src/app';
 
     if (is_dir($directory)) {
@@ -130,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);
+        }
     }
 }
 
@@ -152,6 +143,49 @@ function findGroupFolder($uri): string
     }
 }
 
+function dynamicRoute($uri)
+{
+    global $filesListRoutes;
+    global $dynamicRouteParams;
+    $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) {
+            $segmentMatch = singleDynamicRoute($uriSegments, $routeSegments);
+            if (!empty($segmentMatch)) {
+                $trimSegmentMatch = trim($segmentMatch, '[]');
+                $dynamicRouteParams = [$trimSegmentMatch => $uriSegments[array_search($segmentMatch, $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) {
+                    $normalizedUriEdited = "/src/app/$normalizedUri";
+                    $trimNormalizedUriEdited = str_replace($cleanedRoute, '', $normalizedUriEdited);
+                    $explodedNormalizedUri = explode('/', $trimNormalizedUriEdited);
+                    $pattern = '/\[\.\.\.(.*?)\]/';
+                    if (preg_match($pattern, $normalizedRoute, $matches)) {
+                        $contentWithinBrackets = $matches[1];
+                        $dynamicRouteParams = [$contentWithinBrackets => $explodedNormalizedUri];
+                    }
+
+                    $uriMatch = $normalizedRoute;
+                    break;
+                }
+            }
+        }
+    }
+
+    return $uriMatch;
+}
+
 function isGroupIdentifier($segment): bool
 {
     return preg_match('/^\(.*\)$/', $segment);
@@ -159,15 +193,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;
@@ -192,10 +227,58 @@ function getGroupFolder($uri): string
     return "";
 }
 
-function redirect(string $url): void
+function singleDynamicRoute($uriSegments, $routeSegments)
+{
+    $segmentMatch = "";
+    if (count($routeSegments) != count($uriSegments)) {
+        return $segmentMatch;
+    }
+
+    foreach ($routeSegments as $index => $segment) {
+        if (preg_match('/^\[[^\]]+\]$/', $segment)) {
+            return "{$segment}";
+        } else {
+            if ($segment !== $uriSegments[$index]) {
+                return $segmentMatch;
+            }
+        }
+    }
+    return $segmentMatch;
+}
+
+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)
@@ -221,19 +304,26 @@ 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 = "";
+$dynamicRouteParams = [];
 $content = "";
 $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;
@@ -243,8 +333,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;
@@ -281,8 +375,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();
@@ -293,13 +389,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 {
@@ -314,11 +413,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/index.js

@@ -189,11 +189,7 @@ const ws = new WebSocket("ws://localhost:8080");
 async function createUpdateGitignoreFile(baseDir, additions) {
   const gitignorePath = path.join(baseDir, ".gitignore");
   if (checkExcludeFiles(gitignorePath)) return;
-  // Check if the .gitignore file exists, create if it doesn't
   let gitignoreContent = "";
-  if (fs.existsSync(gitignorePath)) {
-    gitignoreContent = fs.readFileSync(gitignorePath, "utf8");
-  }
   additions.forEach((addition) => {
     if (!gitignoreContent.includes(addition)) {
       gitignoreContent += `\n${addition}`;
@@ -205,6 +201,7 @@ async function createUpdateGitignoreFile(baseDir, additions) {
 }
 // Recursive copy function
 function copyRecursiveSync(src, dest, answer) {
+  var _a;
   console.log("🚀 ~ copyRecursiveSync ~ dest:", dest);
   console.log("🚀 ~ copyRecursiveSync ~ src:", src);
   const exists = fs.existsSync(src);
@@ -212,14 +209,18 @@ function copyRecursiveSync(src, dest, answer) {
   const isDirectory = exists && stats && stats.isDirectory();
   if (isDirectory) {
     const destLower = dest.toLowerCase();
-    console.log("🚀 ~ copyRecursiveSync ~ destLower:", destLower);
-    const destIncludeWebsocket = destLower.includes("src\\lib\\websocket");
-    console.log(
-      "🚀 ~ copyRecursiveSync ~ destIncludeWebsocket:",
-      destIncludeWebsocket
-    );
     if (!answer.websocket && destLower.includes("src\\lib\\websocket")) return;
     if (!answer.prisma && destLower.includes("src\\lib\\prisma")) return;
+    const destModified = dest.replace(/\\/g, "/");
+    if (
+      (_a =
+        updateAnswer === null || updateAnswer === void 0
+          ? void 0
+          : updateAnswer.excludeFilePath) === null || _a === void 0
+        ? void 0
+        : _a.includes(destModified)
+    )
+      return;
     if (!fs.existsSync(dest)) fs.mkdirSync(dest, { recursive: true });
     fs.readdirSync(src).forEach((childItemName) => {
       copyRecursiveSync(
@@ -313,16 +314,8 @@ function modifyLayoutPHP(baseDir, useTailwind) {
 async function createOrUpdateEnvFile(baseDir, content) {
   const envPath = path.join(baseDir, ".env");
   if (checkExcludeFiles(envPath)) return;
-  let envContent = fs.existsSync(envPath)
-    ? fs.readFileSync(envPath, "utf8")
-    : "";
-  // Check if the content already exists in the .env file
-  if (!envContent.includes(content)) {
-    envContent += `${envContent !== "" ? "\n\n" : ""}${content}`;
-    fs.writeFileSync(envPath, envContent, { flag: "w" });
-  } else {
-    console.log(".env file already contains the content.");
-  }
+  console.log("🚀 ~ content:", content);
+  fs.writeFileSync(envPath, content, { flag: "w" });
 }
 function checkExcludeFiles(destPath) {
   var _a, _b;
@@ -355,10 +348,7 @@ async function createDirectoryStructure(baseDir, answer) {
       ? void 0
       : updateAnswer.isUpdate
   ) {
-    filesToCopy.push(
-      { src: "/.env", dest: "/.env" },
-      { src: "/tsconfig.json", dest: "/tsconfig.json" }
-    );
+    filesToCopy.push({ src: "/tsconfig.json", dest: "/tsconfig.json" });
     if (updateAnswer.tailwindcss) {
       filesToCopy.push(
         { src: "/postcss.config.js", dest: "/postcss.config.js" },
@@ -412,7 +402,19 @@ AUTH_SECRET=uxsjXVPHN038DEYls2Kw0QUgBcXKUyrjv416nIFWPY4=
 # SMTP_ENCRYPTION=ssl or tls
 # MAIL_FROM=john.doe@gmail.com
 # MAIL_FROM_NAME="John Doe"`;
-  await createOrUpdateEnvFile(baseDir, prismaPHPEnvContent);
+  if (answer.prisma) {
+    const prismaEnvContent = `# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+DATABASE_URL="postgresql://johndoe:randompassword@localhost:5432/mydb?schema=public"`;
+    const envContent = `${prismaEnvContent}\n\n${prismaPHPEnvContent}`;
+    await createOrUpdateEnvFile(baseDir, envContent);
+  } else {
+    await createOrUpdateEnvFile(baseDir, prismaPHPEnvContent);
+  }
   // Add vendor to .gitignore
   await createUpdateGitignoreFile(baseDir, ["vendor", ".env", "node_modules"]);
 }
@@ -629,7 +631,10 @@ async function main() {
       console.log(chalk.red("Installation cancelled."));
       return;
     }
-    execSync(`npm install -g create-prisma-php-app`, { stdio: "inherit" }); // TODO: Uncomment this line before publishing the package
+    execSync(`npm uninstall -g create-prisma-php-app`, { stdio: "inherit" });
+    execSync(`npm install -g create-prisma-php-app@test-update`, {
+      stdio: "inherit",
+    }); // TODO: Uncomment this line before publishing the package
     // Support for browser-sync
     execSync(`npm install -g browser-sync`, { stdio: "inherit" });
     // Create the project directory
@@ -744,12 +749,25 @@ async function main() {
       JSON.stringify(prismaPhpConfig, null, 2),
       { flag: "w" }
     );
-    execSync(
-      `C:\\xampp\\php\\php.exe C:\\ProgramData\\ComposerSetup\\bin\\composer.phar install`,
-      {
-        stdio: "inherit",
-      }
-    );
+    if (
+      updateAnswer === null || updateAnswer === void 0
+        ? void 0
+        : updateAnswer.isUpdate
+    ) {
+      execSync(
+        `C:\\xampp\\php\\php.exe C:\\ProgramData\\ComposerSetup\\bin\\composer.phar update`,
+        {
+          stdio: "inherit",
+        }
+      );
+    } else {
+      execSync(
+        `C:\\xampp\\php\\php.exe C:\\ProgramData\\ComposerSetup\\bin\\composer.phar install`,
+        {
+          stdio: "inherit",
+        }
+      );
+    }
     console.log(
       `${chalk.green("Success!")} Prisma PHP project successfully created in ${
         answer.projectName

package/dist/prisma/schema.prisma

@@ -17,6 +17,8 @@ model User {
   password      String?
   emailVerified DateTime?
   image         String?
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
 
   roleId   Int?
   userRole UserRole? @relation(fields: [roleId], references: [id])