create-prisma-php-app 1.20.516 → 1.20.518

package/dist/bootstrap.php

@@ -386,15 +386,41 @@ function setupErrorHandling(&$content)
 ob_start();
 require_once SETTINGS_PATH . '/public-functions.php';
 require_once SETTINGS_PATH . '/request-methods.php';
-$metadataFile = APP_PATH . '/metadata.php';
-$_metadataArray = file_exists($metadataFile) ? require_once $metadataFile : [];
+$_metadataFile = APP_PATH . '/metadata.php';
+$_metadataArray = file_exists($_metadataFile) ? require_once $_metadataFile : [];
 $_filesListRoutes = [];
-$metadata = "";
+/**
+ * @var array $metadata Metadata information
+ */
+$metadata = [];
+/**
+ * @var string $uri The URI of the current request
+ */
 $uri = "";
+/**
+ * @var string $pathname The pathname of the current request
+ */
 $pathname = "";
+/**
+ * @var array $dynamicRouteParams The dynamic route parameters
+ */
 $dynamicRouteParams = [];
+/**
+ * @var string $content The content to be included in the main layout file
+ */
 $content = "";
+/**
+ * @var string $childContent The child content to be included in the layout file
+ */
 $childContent = "";
+/**
+ * @var array $mainLayoutHead The head content to be included in the main layout file
+ */
+$mainLayoutHead = [];
+/**
+ * @var array $mainLayoutFooter The footer content to be included in the main layout file
+ */
+$mainLayoutFooter = [];
 
 function containsChildContent($filePath)
 {
@@ -639,7 +665,7 @@ try {
         exit;
     }
 
-    $metadata = $_metadataArray[$uri] ?? ($_metadataArray['default'] ?? null);
+    $metadata = $_metadataArray[$uri] ?? ($_metadataArray['default'] ?? []);
     $_parentLayoutPath = APP_PATH . '/layout.php';
     $_isParentLayout = !empty($_layoutsToInclude) && strpos($_layoutsToInclude[0], 'src/app/layout.php') !== false;
 

package/dist/index.js

@@ -351,9 +351,10 @@ function modifyLayoutPHP(baseDir, answer) {
     // Insert before the closing </head> tag
     indexContent = indexContent.replace(
       "</head>",
-      `${tailwindLink}\n    <!-- Dynamic Head -->\n
-    <?php echo implode("\n", $mainLayoutHead); ?></head>`
+      `${tailwindLink}\n    <!-- Dynamic Head -->
+    <?php echo implode("\\n", $mainLayoutHead); ?></head>`
     );
+    console.log("🚀 ~ modifyLayoutPHP ~ indexContent:", indexContent);
     fs.writeFileSync(layoutPath, indexContent, { flag: "w" });
     console.log(
       chalk.green(

package/dist/settings/paths.php

@@ -1,10 +1,30 @@
 <?php
 
-// Absolute path
+/**
+ * @var string SETTINGS_PATH - The absolute path to the settings directory
+ */
 define("SETTINGS_PATH", dirname(__FILE__));
+/**
+ * @var string PUBLIC_PATH - The absolute path to the public directory
+ */
 define("PUBLIC_PATH", dirname(SETTINGS_PATH) . "/public");
+/**
+ * @var string PRISMA_LIB_PATH - The absolute path to the Prisma library directory
+ */
 define("PRISMA_LIB_PATH", dirname(SETTINGS_PATH) . "/src/Lib/Prisma");
+/**
+ * @var string SRC_PATH - The absolute path to the src directory
+ */
 define("SRC_PATH", dirname(SETTINGS_PATH) . "/src");
+/**
+ * @var string APP_PATH - The absolute path to the app directory
+ */
 define("APP_PATH", dirname(SETTINGS_PATH) . "/src/app");
+/**
+ * @var string LIB_PATH - The absolute path to the layout directory
+ */
 define("LIB_PATH", dirname(SETTINGS_PATH) . "/src/Lib");
+/**
+ * @var string DOCUMENT_PATH - The absolute path to the layout directory
+ */
 define("DOCUMENT_PATH", dirname(SETTINGS_PATH));

package/dist/settings/request-methods.php

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @var string $requestMethod - The request method.
+ */
 $requestMethod = $_SERVER['REQUEST_METHOD'];
 
 if ($requestMethod == 'OPTIONS') {
@@ -7,6 +10,9 @@ if ($requestMethod == 'OPTIONS') {
     exit;
 }
 
+/**
+ * @var array $allowedMethods - The allowed request methods.
+ */
 $allowedMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'];
 
 if (!in_array($requestMethod, $allowedMethods)) {
@@ -15,27 +21,83 @@ if (!in_array($requestMethod, $allowedMethods)) {
     exit;
 }
 
+/**
+ * @var bool $isGet - True if the request method is GET, false otherwise.
+ */
 $isGet = $requestMethod === 'GET';
+/**
+ * @var bool $isPost - True if the request method is POST, false otherwise.
+ */
 $isPost = $requestMethod === 'POST';
+/**
+ * @var bool $isPut - True if the request method is PUT, false otherwise.
+ */
 $isPut = $requestMethod === 'PUT';
+/**
+ * @var bool $isDelete - True if the request method is DELETE, false otherwise.
+ */
 $isDelete = $requestMethod === 'DELETE';
+/**
+ * @var bool $isPatch - True if the request method is PATCH, false otherwise.
+ */
 $isPatch = $requestMethod === 'PATCH';
+/**
+ * @var bool $isHead - True if the request method is HEAD, false otherwise.
+ */
 $isHead = $requestMethod === 'HEAD';
+/**
+ * @var bool $isOptions - True if the request method is OPTIONS, false otherwise.
+ */
 $isOptions = $requestMethod === 'OPTIONS';
+/**
+ * @var bool $isAjax - True if the request is an AJAX request, false otherwise.
+ */
 $isAjax = isAjaxRequest();
+/**
+ * @var bool $isWire - True if the request is a wire request, false otherwise.
+ */
 $isWire = isWireRequest();
+/**
+ * @var bool $isXFilRequest - True if the request is an X-Fil request, false otherwise.
+ */
 $isXFilRequest = isXFilRequest();
+/**
+ * @var string $contentType - The content type of the request.
+ */
 $contentType = $_SERVER['CONTENT_TYPE'] ?? '';
+/**
+ * @var string $requestedWith - The X-Requested-With header of the request.
+ */
 $requestedWith = $_SERVER['HTTP_X_REQUESTED_WITH'] ?? '';
+/**
+ * @var string $protocol - The protocol of the request.
+ */
 $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
     (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') ||
     $_SERVER['SERVER_PORT'] == 443 ? "https://" : "http://";
+/**
+ * @var string $domainName - The domain name of the request.
+ */
 $domainName = $_SERVER['HTTP_HOST'];
-$scriptName = dirname($_SERVER['SCRIPT_NAME']) . '/';
-$baseUrl = $protocol . $domainName . rtrim($scriptName, '/') . '/src/app';
-$documentUrl = $protocol . $domainName . rtrim($scriptName, '/');
+/**
+ * @var string $scriptName - The script name of the request.
+ */
+$scriptName = dirname($_SERVER['SCRIPT_NAME']);
+/**
+ * @var string $baseUrl - The base URL of the request.
+ */
+$baseUrl = $protocol . $domainName . "$scriptName/src/app";
+/**
+ * @var string $documentUrl - The document URL of the request.
+ */
+$documentUrl = $protocol . $domainName . $scriptName;
+/**
+ * @var string $referer - The referer of the request.
+ */
 $referer = $_SERVER['HTTP_REFERER'] ?? 'Unknown';
-
+/**
+ * @var \ArrayObject $params - The request parameters
+ */
 $params = [];
 
 if ($requestMethod == 'GET') {

package/dist/settings/start-dev.js

@@ -1,9 +1,21 @@
-import { exec } from "child_process";
+import { exec, spawn } from "child_process";
 import chalk from "chalk";
 import { writeFileSync } from "fs";
 import readline from "readline";
 
-function runCommand(command, options = {}) {
+const BROWSERSYNC_PREFIX = "[Browsersync]";
+const REGEX_PATTERNS = {
+  BROWSERSYNC: /^\[Browsersync\]\s*(.+)$/,
+  PROXYING: /Proxying/,
+  ACCESS_URLS: /Access URLs:/,
+  LOCAL_URL: /Local:\s*(http:\/\/.+)/,
+  EXTERNAL_URL: /External:\s*(http:\/\/\S+)/,
+  UI_URL: /UI:\s*(http:\/\/.+)/,
+  UI_EXTERNAL_URL: /UI External:\s*(http:\/\/.+)/,
+  WATCHING_FILES: /Watching files/,
+};
+
+async function runCommand(command, options = {}) {
   return new Promise((resolve, reject) => {
     const process = exec(command, options);
 
@@ -31,6 +43,8 @@ function runCommand(command, options = {}) {
 }
 
 async function startDev() {
+  let browserSync;
+  let devProcess;
   try {
     // Step 1: Start projectName and wait for it to complete
     console.log("Starting projectName...");
@@ -39,8 +53,9 @@ async function startDev() {
 
     // Step 2: Start browserSync and process its output
     console.log("Starting browser-sync...");
-    const browserSync = exec("npm run browserSync");
-    let formattedLog = {
+    browserSync = spawn("npm", ["run", "browserSync"], { shell: true });
+
+    const formattedLog = {
       local: "",
       external: "",
       ui: "",
@@ -55,44 +70,52 @@ async function startDev() {
     let browserSyncReady = false;
 
     rl.on("line", (line) => {
-      if (/Proxying/.test(line)) {
-        console.log(line.trim());
-      } else if (/Access URLs:/.test(line)) {
-        console.log(chalk.green("[Browsersync] Access URLs:"));
-      } else if (/Local:/.test(line)) {
-        const match = line.match(/Local:\s*(http:\/\/.+)/);
+      if (REGEX_PATTERNS.PROXYING.test(line)) {
+        const match = line.match(REGEX_PATTERNS.BROWSERSYNC);
+        if (match) {
+          console.log(`${chalk.blue(BROWSERSYNC_PREFIX)} ${match[1]}`);
+        }
+      } else if (REGEX_PATTERNS.ACCESS_URLS.test(line)) {
+        const match = line.match(REGEX_PATTERNS.BROWSERSYNC);
+        if (match) {
+          console.log(`${chalk.blue(BROWSERSYNC_PREFIX)} ${match[1]}`);
+        }
+      } else if (REGEX_PATTERNS.LOCAL_URL.test(line)) {
+        const match = line.match(REGEX_PATTERNS.LOCAL_URL);
         if (match) {
           const localUrl = match[1];
           formattedLog.local = localUrl;
-          console.log(chalk.white("Local: ") + chalk.cyanBright(localUrl));
+          console.log(`${chalk.white("Local: ")}${chalk.cyanBright(localUrl)}`);
         }
       } else if (/^ {4}External:/.test(line)) {
-        const match = line.match(/External:\s*(http:\/\/\S+)/);
+        const match = line.match(REGEX_PATTERNS.EXTERNAL_URL);
         if (match) {
           const externalUrl = match[1];
           formattedLog.external = externalUrl;
           console.log(
-            chalk.white("External: ") + chalk.magentaBright(externalUrl)
+            `${chalk.white("External: ")}${chalk.magentaBright(externalUrl)}`
           );
         }
-      } else if (/UI:/.test(line)) {
-        const match = line.match(/UI:\s*(http:\/\/.+)/);
+      } else if (REGEX_PATTERNS.UI_URL.test(line)) {
+        const match = line.match(REGEX_PATTERNS.UI_URL);
         if (match) {
           const uiUrl = match[1];
           formattedLog.ui = uiUrl;
-          console.log(chalk.yellow("UI: ") + chalk.cyanBright(uiUrl));
+          console.log(`${chalk.yellow("UI: ")}${chalk.cyanBright(uiUrl)}`);
         }
-      } else if (/UI External:/.test(line)) {
-        const match = line.match(/UI External:\s*(http:\/\/.+)/);
+      } else if (REGEX_PATTERNS.UI_EXTERNAL_URL.test(line)) {
+        const match = line.match(REGEX_PATTERNS.UI_EXTERNAL_URL);
         if (match) {
           const uiExternalUrl = match[1];
           formattedLog.uiExternal = uiExternalUrl;
           console.log(
-            chalk.yellow("UI External: ") + chalk.magentaBright(uiExternalUrl)
+            `${chalk.yellow("UI External: ")}${chalk.magentaBright(
+              uiExternalUrl
+            )}`
           );
         }
-      } else if (/Watching files/.test(line)) {
-        console.log(`${chalk.blue("[Browsersync]")} Watching files...`);
+      } else if (REGEX_PATTERNS.WATCHING_FILES.test(line)) {
+        console.log(`${chalk.blue(BROWSERSYNC_PREFIX)} Watching files...`);
         const outputPath = "./settings/bs-output.json";
         writeFileSync(
           outputPath,
@@ -106,27 +129,29 @@ async function startDev() {
           // Start _dev after browserSync is ready
           startDevProcess();
         }
-      } else if (/Reloading Browsers/.test(line)) {
-        console.log(`${chalk.blue("[Browsersync]")} Reloading Browsers...`);
+      } else if (REGEX_PATTERNS.BROWSERSYNC.test(line)) {
+        const match = line.match(REGEX_PATTERNS.BROWSERSYNC);
+        if (match) {
+          console.log(`${chalk.blue(BROWSERSYNC_PREFIX)} ${match[1]}`);
+        }
       } else {
         // Print any other notifications
         console.log(line);
       }
     });
 
-    const rlErr = readline.createInterface({
-      input: browserSync.stderr,
-      crlfDelay: Infinity,
+    browserSync.stderr.on("data", (data) => {
+      console.error(`browser-sync error: ${data.toString()}`);
     });
 
-    rlErr.on("line", (line) => {
-      console.error(`browser-sync error: ${line}`);
+    browserSync.on("error", (err) => {
+      console.error(`Failed to start browserSync process: ${err.message}`);
     });
 
     // Function to start _dev process
     function startDevProcess() {
       console.log("Starting _dev...");
-      const devProcess = exec("npm run _dev");
+      devProcess = spawn("npm", ["run", "_dev"], { shell: true });
 
       devProcess.stdout.on("data", (data) => {
         process.stdout.write(data);
@@ -139,14 +164,39 @@ async function startDev() {
       devProcess.on("close", (code) => {
         console.log(`Dev process exited with code ${code}`);
       });
+
+      devProcess.on("error", (err) => {
+        console.error(`Failed to start dev process: ${err.message}`);
+      });
     }
 
     // Handle browserSync close event
     browserSync.on("close", (code) => {
       console.log(`browserSync process exited with code ${code}`);
     });
+
+    // Handle process exit and cleanup
+    function handleExit() {
+      if (browserSync) {
+        browserSync.kill();
+      }
+      if (devProcess) {
+        devProcess.kill();
+      }
+    }
+
+    process.on("exit", handleExit);
+    process.on("SIGINT", () => {
+      handleExit();
+      process.exit();
+    });
+    process.on("SIGTERM", () => {
+      handleExit();
+      process.exit();
+    });
   } catch (error) {
     console.error("An error occurred:", error.message);
+    process.exit(1);
   }
 }
 

package/dist/settings/swagger-setup.js

@@ -3,6 +3,7 @@ import { writeFileSync } from "fs";
 import { fileURLToPath } from "url";
 import { join, dirname } from "path";
 import { readFileSync } from "fs";
+import chalk from "chalk";
 
 // Define __dirname equivalent in ES modules
 const __filename = fileURLToPath(import.meta.url);
@@ -47,7 +48,9 @@ const swaggerSpec = JSON.stringify(swaggerJsdoc(options), null, 2);
 try {
   writeFileSync(outputPath, swaggerSpec, "utf-8");
   console.log(
-    `Swagger JSON has been generated and saved to /src/app/swagger-docs/pphp-swagger.json`
+    `Swagger JSON has been generated and saved to ${chalk.blue(
+      "src/app/swagger-docs/pphp-swagger.json"
+    )}`
   );
 } catch (error) {
   console.error("Error saving Swagger JSON:", error);

package/dist/src/app/index.php

@@ -1,7 +1,7 @@
 <div class="flex flex-col min-h-[100vh] bg-gradient-to-b from-[#a1b8c2] to-white dark:from-[#334455] dark:to-black">
     <header class="px-4 lg:px-6 h-14 flex items-center">
         <a class="flex items-center justify-center" href="/">
-            <img class="h-10 w-10" src="<?= $baseUrl ?>assets/images/prisma-php.png" alt="Prisma PHP">
+            <img class="h-10 w-10" src="<?php echo $baseUrl ?>/assets/images/prisma-php.png" alt="Prisma PHP">
             <span class="sr-only">Prisma PHP</span>
         </a>
         <nav class="ml-auto flex gap-4 sm:gap-6">
@@ -24,7 +24,7 @@
             <div class="px-4 md:px-6">
                 <div class="flex flex-col items-center space-y-4 text-center">
                     <h1 class="text-3xl font-bold tracking-tighter sm:text-4xl md:text-5xl lg:text-6xl/none flex items-center gap-3 justify-center">
-                        Welcome to Prisma PHP <img class="h-20 w-20 hidden sm:block" src="<?= $baseUrl ?>assets/images/prisma-php.png" alt="Prisma PHP">
+                        Welcome to Prisma PHP <img class="h-20 w-20 hidden sm:block" src="<?php echo $baseUrl ?>/assets/images/prisma-php.png" alt="Prisma PHP">
                     </h1>
                     <p class="mx-auto max-w-[700px] text-gray-500 md:text-xl dark:text-gray-400">
                         The Next Generation ORM for PHP

package/dist/swagger-docs-index.php

@@ -1,4 +1,15 @@
+<?php
+
+$mainLayoutHead = [
+    "<link rel='stylesheet' type='text/css' href='$baseUrl/swagger-docs/dist/swagger-ui.css' />",
+    "<link rel='stylesheet' type='text/css' href='$baseUrl/swagger-docs/dist/index.css' />",
+    "<link rel='icon' type='image/png' href='$baseUrl/swagger-docs/dist/favicon-32x32.png' sizes='32x32' />",
+    "<link rel='icon' type='image/png' href='$baseUrl/swagger-docs/dist/favicon-16x16.png' sizes='16x16' />",
+]
+
+?>
+
 <div id="swagger-ui"></div>
-<script src="<?= $baseUrl ?>swagger-docs/dist/swagger-ui-bundle.js" charset="UTF-8"> </script>
-<script src="<?= $baseUrl ?>swagger-docs/dist/swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
-<script src="<?= $baseUrl ?>swagger-docs/dist/swagger-initializer.js" charset="UTF-8"> </script>
+<script src="<?php echo $baseUrl ?>/swagger-docs/dist/swagger-ui-bundle.js" charset="UTF-8"> </script>
+<script src="<?php echo $baseUrl ?>/swagger-docs/dist/swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
+<script src="<?php echo $baseUrl ?>/swagger-docs/dist/swagger-initializer.js" charset="UTF-8"> </script>

package/dist/swagger-docs-layout.php

@@ -3,15 +3,13 @@
 
 <head>
     <meta charset="UTF-8">
-    <title>Swagger UI</title>
-    <link rel="stylesheet" type="text/css" href="<?= $baseUrl ?>swagger-docs/dist/swagger-ui.css" />
-    <link rel="stylesheet" type="text/css" href="<?= $baseUrl ?>swagger-docs/dist/index.css" />
-    <link rel="icon" type="image/png" href="<?= $baseUrl ?>swagger-docs/dist/favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="<?= $baseUrl ?>swagger-docs/dist/favicon-16x16.png" sizes="16x16" />
+    <title>Prisma PHP Swagger UI</title>
 </head>
 
 <body>
     <?php echo $content; ?>
+    <!-- Dynamic Footer -->
+    <?php echo implode("\n", $mainLayoutFooter); ?>
 </body>
 
 </html>

package/package.json

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