create-prisma-php-app 1.6.56 → 1.6.58

package/dist/index.js

@@ -73,6 +73,8 @@ function configureBrowserSyncCommand(baseDir, projectSettings) {
 }
 async function updatePackageJson(baseDir, projectSettings, answer) {
     const packageJsonPath = path.join(baseDir, "package.json");
+    if (checkExcludeFiles(packageJsonPath))
+        return;
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
     // Use the new function to configure the Browser Sync command
     const browserSyncCommand = configureBrowserSyncCommand(baseDir, projectSettings);
@@ -109,6 +111,8 @@ async function updateComposerJson(baseDir, answer) {
     if (!answer.websocket)
         return;
     const composerJsonPath = path.join(baseDir, "composer.json");
+    if (checkExcludeFiles(composerJsonPath))
+        return;
     let composerJson;
     // Check if the composer.json file exists
     if (fs.existsSync(composerJsonPath)) {
@@ -133,6 +137,8 @@ async function updateIndexJsForWebSocket(baseDir, answer) {
         return;
     }
     const indexPath = path.join(baseDir, "src", "app", "js", "index.js");
+    if (checkExcludeFiles(indexPath))
+        return;
     let indexContent = fs.readFileSync(indexPath, "utf8");
     // WebSocket initialization code to be appended
     const webSocketCode = `
@@ -147,6 +153,8 @@ const ws = new WebSocket("ws://localhost:8080");
 // This function updates the .gitignore file
 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)) {
@@ -163,7 +171,6 @@ async function createUpdateGitignoreFile(baseDir, additions) {
 }
 // Recursive copy function
 function copyRecursiveSync(src, dest) {
-    var _a;
     console.log("🚀 ~ copyRecursiveSync ~ dest:", dest);
     console.log("🚀 ~ copyRecursiveSync ~ src:", src);
     const exists = fs.existsSync(src);
@@ -176,10 +183,8 @@ function copyRecursiveSync(src, dest) {
         });
     }
     else {
-        if ((_a = updateAnswer === null || updateAnswer === void 0 ? void 0 : updateAnswer.excludeFiles) === null || _a === void 0 ? void 0 : _a.includes(dest.replace(/\\/g, "/"))) {
-            console.log(`Skipping file: ${src}`);
+        if (checkExcludeFiles(dest))
             return;
-        }
         fs.copyFileSync(src, dest, 0);
     }
 }
@@ -194,6 +199,8 @@ async function executeCopy(baseDir, directoriesToCopy) {
 function createOrUpdateTailwindConfig(baseDir) {
     console.log("🚀 ~ createOrUpdateTailwindConfig ~ baseDir:", baseDir);
     const filePath = path.join(baseDir, "tailwind.config.js");
+    if (checkExcludeFiles(filePath))
+        return;
     const newContent = [
         "./src/app/**/*.{html,js,php}",
         // Add more paths as needed
@@ -209,6 +216,8 @@ function createOrUpdateTailwindConfig(baseDir) {
 }
 function modifyPostcssConfig(baseDir) {
     const filePath = path.join(baseDir, "postcss.config.js");
+    if (checkExcludeFiles(filePath))
+        return;
     const newContent = `export default {
   plugins: {
     tailwindcss: {},
@@ -219,10 +228,12 @@ function modifyPostcssConfig(baseDir) {
     fs.writeFileSync(filePath, newContent, { flag: "w" });
     console.log(chalk.green("postcss.config.js updated successfully."));
 }
-function modifyIndexPHP(baseDir, useTailwind) {
-    const indexPath = path.join(baseDir, "src", "app", "layout.php");
+function modifyLayoutPHP(baseDir, useTailwind) {
+    const layoutPath = path.join(baseDir, "src", "app", "layout.php");
+    if (checkExcludeFiles(layoutPath))
+        return;
     try {
-        let indexContent = fs.readFileSync(indexPath, "utf8");
+        let indexContent = fs.readFileSync(layoutPath, "utf8");
         const stylesAndLinks = `\n    <link href="<?php echo $baseUrl; ?>css/index.css" rel="stylesheet">\n    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;800&display=swap" rel="stylesheet">\n    <script src="<?php echo $baseUrl; ?>js/index.js"></script>`;
         // Tailwind CSS link or CDN script
         const tailwindLink = useTailwind
@@ -230,7 +241,7 @@ function modifyIndexPHP(baseDir, useTailwind) {
             : `    <script src="https://cdn.tailwindcss.com"></script> ${stylesAndLinks}`;
         // Insert before the closing </head> tag
         indexContent = indexContent.replace("</head>", `${tailwindLink}\n</head>`);
-        fs.writeFileSync(indexPath, indexContent, { flag: "w" });
+        fs.writeFileSync(layoutPath, indexContent, { flag: "w" });
         console.log(chalk.green(`index.php modified successfully for ${useTailwind ? "local Tailwind CSS" : "Tailwind CSS CDN"}.`));
     }
     catch (error) {
@@ -240,6 +251,8 @@ function modifyIndexPHP(baseDir, useTailwind) {
 // This function updates or creates the .env file
 async function createOrUpdateEnvFile(baseDir, content) {
     const envPath = path.join(baseDir, ".env");
+    if (checkExcludeFiles(envPath))
+        return;
     let envContent = fs.existsSync(envPath)
         ? fs.readFileSync(envPath, "utf8")
         : "";
@@ -249,6 +262,10 @@ async function createOrUpdateEnvFile(baseDir, content) {
         fs.writeFileSync(envPath, envContent, { flag: "w" });
     }
 }
+function checkExcludeFiles(destPath) {
+    var _a, _b;
+    return ((_b = (_a = updateAnswer === null || updateAnswer === void 0 ? void 0 : updateAnswer.excludeFiles) === null || _a === void 0 ? void 0 : _a.includes(destPath.replace(/\\/g, "/"))) !== null && _b !== void 0 ? _b : false);
+}
 async function createDirectoryStructure(baseDir, answer, projectSettings) {
     console.log("🚀 ~ baseDir:", baseDir);
     console.log("🚀 ~ answer:", answer);
@@ -294,6 +311,8 @@ async function createDirectoryStructure(baseDir, answer, projectSettings) {
     filesToCopy.forEach(({ src, dest }) => {
         const sourcePath = path.join(__dirname, src);
         const destPath = path.join(baseDir, dest);
+        if (checkExcludeFiles(destPath))
+            return;
         const code = fs.readFileSync(sourcePath, "utf8");
         fs.writeFileSync(destPath, code, { flag: "w" });
     });
@@ -303,11 +322,11 @@ async function createDirectoryStructure(baseDir, answer, projectSettings) {
     await updateIndexJsForWebSocket(baseDir, answer);
     if (answer.tailwindcss) {
         createOrUpdateTailwindConfig(baseDir);
-        modifyIndexPHP(baseDir, true);
+        modifyLayoutPHP(baseDir, true);
         modifyPostcssConfig(baseDir);
     }
     else {
-        modifyIndexPHP(baseDir, false);
+        modifyLayoutPHP(baseDir, false);
     }
     const envContent = `# PHPMailer
 SMTP_HOST=

package/dist/prisma-php.js

@@ -9,88 +9,100 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const args = process.argv.slice(2);
 const readJsonFile = (filePath) => {
-    const jsonData = fs.readFileSync(filePath, "utf8");
-    return JSON.parse(jsonData);
+  const jsonData = fs.readFileSync(filePath, "utf8");
+  return JSON.parse(jsonData);
 };
 const executeCommand = (command, args = [], options = {}) => {
-    return new Promise((resolve, reject) => {
-        const process = spawn(command, args, Object.assign({ stdio: "inherit", shell: true }, options));
-        process.on("error", (error) => {
-            console.error(`Execution error: ${error.message}`);
-            reject(error);
-        });
-        process.on("close", (code) => {
-            if (code === 0) {
-                resolve();
-            }
-            else {
-                reject(new Error(`Process exited with code ${code}`));
-            }
-        });
+  return new Promise((resolve, reject) => {
+    const process = spawn(
+      command,
+      args,
+      Object.assign({ stdio: "inherit", shell: true }, options)
+    );
+    process.on("error", (error) => {
+      console.error(`Execution error: ${error.message}`);
+      reject(error);
     });
+    process.on("close", (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Process exited with code ${code}`));
+      }
+    });
+  });
 };
 async function getAnswer() {
-    const questions = [
-        {
-            type: "toggle",
-            name: "shouldProceed",
-            message: `This command will update the ${chalk.blue("create-prisma-php-app")} package and overwrite all default files. ${chalk.blue("Do you want to proceed")}?`,
-            initial: false,
-            active: "Yes",
-            inactive: "No",
-        },
-    ];
-    const onCancel = () => {
-        console.log(chalk.red("Operation cancelled by the user."));
-        process.exit(0);
-    };
-    const response = await prompts(questions, { onCancel });
-    if (Object.keys(response).length === 0) {
-        return null;
-    }
-    return response;
+  const questions = [
+    {
+      type: "toggle",
+      name: "shouldProceed",
+      message: `This command will update the ${chalk.blue(
+        "create-prisma-php-app"
+      )} package and overwrite all default files. ${chalk.blue(
+        "Do you want to proceed"
+      )}?`,
+      initial: false,
+      active: "Yes",
+      inactive: "No",
+    },
+  ];
+  const onCancel = () => {
+    console.log(chalk.red("Operation cancelled by the user."));
+    process.exit(0);
+  };
+  const response = await prompts(questions, { onCancel });
+  if (Object.keys(response).length === 0) {
+    return null;
+  }
+  return response;
 }
 const main = async () => {
-    if (args.length > 0 && args[0] === "update") {
-        try {
-            const answer = await getAnswer();
-            if (!(answer === null || answer === void 0 ? void 0 : answer.shouldProceed)) {
-                console.log(chalk.red("Operation cancelled by the user."));
-                return;
-            }
-            const currentDir = process.cwd();
-            const configPath = path.join(currentDir, "prisma-php.json");
-            if (!fs.existsSync(configPath)) {
-                console.error(chalk.red("The configuration file 'prisma-php.json' was not found in the current directory."));
-                return;
-            }
-            const localSettings = readJsonFile(configPath);
-            const commandArgs = [localSettings.projectName];
-            if (localSettings.tailwindcss)
-                commandArgs.push("--tailwindcss");
-            if (localSettings.websocket)
-                commandArgs.push("--websocket");
-            console.log("Executing command...\n");
-            await executeCommand("npx", [
-                "create-prisma-php-app@alpha-update-command",
-                ...commandArgs,
-            ]);
-        }
-        catch (error) {
-            if (error instanceof Error) {
-                if (error.message.includes("no such file or directory")) {
-                    console.error(chalk.red("The configuration file 'prisma-php.json' was not found in the current directory."));
-                }
-            }
-            else {
-                console.error("Error in script execution:", error);
-            }
+  if (args.length > 0 && args[0] === "update") {
+    try {
+      const answer = await getAnswer();
+      if (
+        !(answer === null || answer === void 0 ? void 0 : answer.shouldProceed)
+      ) {
+        console.log(chalk.red("Operation cancelled by the user."));
+        return;
+      }
+      const currentDir = process.cwd();
+      const configPath = path.join(currentDir, "prisma-php.json");
+      if (!fs.existsSync(configPath)) {
+        console.error(
+          chalk.red(
+            "The configuration file 'prisma-php.json' was not found in the current directory."
+          )
+        );
+        return;
+      }
+      const localSettings = readJsonFile(configPath);
+      const commandArgs = [localSettings.projectName];
+      if (localSettings.tailwindcss) commandArgs.push("--tailwindcss");
+      if (localSettings.websocket) commandArgs.push("--websocket");
+      console.log("Executing command...\n");
+      await executeCommand("npx", [
+        "create-prisma-php-app@alpha-update-command",
+        ...commandArgs,
+      ]);
+    } catch (error) {
+      if (error instanceof Error) {
+        if (error.message.includes("no such file or directory")) {
+          console.error(
+            chalk.red(
+              "The configuration file 'prisma-php.json' was not found in the current directory."
+            )
+          );
         }
+      } else {
+        console.error("Error in script execution:", error);
+      }
     }
-    else {
-        console.log("Command not recognized.");
-    }
+  } else {
+    console.log("Command not recognized.");
+  }
 };
 main().catch((error) => {
-    console.error("Unhandled error in main function:", error);
+  console.error("Unhandled error in main function:", error);
 });

package/package.json

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