create-prisma-php-app 4.0.0-alpha.34 → 4.0.0-alpha.35

package/dist/index.js

@@ -373,6 +373,14 @@ function copyRecursiveSyncWithExclusions(
       );
     });
   } else {
+    const fileName = path.basename(dest);
+    // Always exclude critical config files from starter kit overwrites
+    if (fileName === "prisma-php.json") {
+      console.log(
+        chalk.yellow(`Protecting config file: ${dest.replace(/\\/g, "/")}`)
+      );
+      return;
+    }
     // Apply user-defined exclusions for files
     if (respectExclusions && checkExcludeFiles(dest)) {
       console.log(
@@ -407,6 +415,69 @@ function copyRecursiveSyncWithExclusions(
     fs.copyFileSync(src, dest, 0);
   }
 }
+function mergeConfigurationFiles(
+  projectPath,
+  answer,
+  latestVersion,
+  existingConfig
+) {
+  const projectPathModified = projectPath.replace(/\\/g, "\\");
+  const bsConfig = bsConfigUrls(projectPathModified);
+  // If we have existing config, merge with it
+  if (existingConfig) {
+    const mergedConfig = {
+      ...existingConfig, // Start with existing config
+      // Only update specific fields that should be updated
+      projectName: answer.projectName,
+      projectRootPath: projectPathModified,
+      bsTarget: bsConfig.bsTarget,
+      bsPathRewrite: bsConfig.bsPathRewrite,
+      // Update feature flags only if they're different from existing
+      backendOnly: answer.backendOnly,
+      swaggerDocs: answer.swaggerDocs,
+      tailwindcss: answer.tailwindcss,
+      websocket: answer.websocket,
+      mcp: answer.mcp,
+      prisma: answer.prisma,
+      docker: answer.docker,
+      version: latestVersion,
+      // KEEP existing excludeFiles - this is crucial!
+      excludeFiles: existingConfig.excludeFiles || [],
+    };
+    fs.writeFileSync(
+      path.join(projectPath, "prisma-php.json"),
+      JSON.stringify(mergedConfig, null, 2),
+      { flag: "w" }
+    );
+    console.log(
+      chalk.green("✓ Configuration merged successfully, exclusions preserved")
+    );
+  } else {
+    // New project - create fresh config
+    const prismaPhpConfig = {
+      projectName: answer.projectName,
+      projectRootPath: projectPathModified,
+      phpEnvironment: "XAMPP",
+      phpRootPathExe: "C:\\xampp\\php\\php.exe",
+      bsTarget: bsConfig.bsTarget,
+      bsPathRewrite: bsConfig.bsPathRewrite,
+      backendOnly: answer.backendOnly,
+      swaggerDocs: answer.swaggerDocs,
+      tailwindcss: answer.tailwindcss,
+      websocket: answer.websocket,
+      mcp: answer.mcp,
+      prisma: answer.prisma,
+      docker: answer.docker,
+      version: latestVersion,
+      excludeFiles: [],
+    };
+    fs.writeFileSync(
+      path.join(projectPath, "prisma-php.json"),
+      JSON.stringify(prismaPhpConfig, null, 2),
+      { flag: "w" }
+    );
+  }
+}
 async function main() {
   try {
     const args = process.argv.slice(2);
@@ -871,29 +942,25 @@ async function main() {
         await uninstallComposerDependencies(projectPath, composerToUninstall);
       }
     }
-    const projectPathModified = projectPath.replace(/\\/g, "\\");
-    const bsConfig = bsConfigUrls(projectPathModified);
-    const prismaPhpConfig = {
-      projectName: answer.projectName,
-      projectRootPath: projectPathModified,
-      phpEnvironment: "XAMPP",
-      phpRootPathExe: "C:\\xampp\\php\\php.exe",
-      bsTarget: bsConfig.bsTarget,
-      bsPathRewrite: bsConfig.bsPathRewrite,
-      backendOnly: answer.backendOnly,
-      swaggerDocs: answer.swaggerDocs,
-      tailwindcss: answer.tailwindcss,
-      websocket: answer.websocket,
-      mcp: answer.mcp,
-      prisma: answer.prisma,
-      docker: answer.docker,
-      version: latestVersionOfCreatePrismaPhpApp,
-      excludeFiles: updateAnswer?.excludeFiles ?? [],
-    };
-    fs.writeFileSync(
-      path.join(projectPath, "prisma-php.json"),
-      JSON.stringify(prismaPhpConfig, null, 2),
-      { flag: "w" }
+    // Check if there's an existing config to merge with
+    let existingConfig = null;
+    const configPath = path.join(projectPath, "prisma-php.json");
+    if (fs.existsSync(configPath) && updateAnswer?.excludeFiles) {
+      try {
+        existingConfig = JSON.parse(fs.readFileSync(configPath, "utf8"));
+        console.log(chalk.blue("Found existing configuration, merging..."));
+      } catch (error) {
+        console.warn(
+          chalk.yellow("Could not read existing config, creating new one")
+        );
+      }
+    }
+    // Merge or create configuration
+    mergeConfigurationFiles(
+      projectPath,
+      answer,
+      latestVersionOfCreatePrismaPhpApp,
+      existingConfig
     );
     if (updateAnswer?.isUpdate) {
       execSync(

package/package.json

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