create-prisma-php-app 4.0.0-alpha.37 → 4.0.0-alpha.39

package/dist/index.js

@@ -957,29 +957,63 @@ async function main() {
         await uninstallComposerDependencies(projectPath, composerToUninstall);
       }
     }
-    // Check if there's an existing config to merge with
+    // Check for existing config to merge with
     let existingConfig = null;
-    const configPath = path.join(projectPath, "prisma-php.json");
-    // Always check if config exists - don't depend on updateAnswer
-    if (fs.existsSync(configPath)) {
+    const currentDirConfigPath = path.join(process.cwd(), "prisma-php.json");
+    const finalProjectConfigPath = path.join(projectPath, "prisma-php.json");
+    // First, check current directory (where command is run) for existing config
+    if (
+      fs.existsSync(currentDirConfigPath) &&
+      currentDirConfigPath !== finalProjectConfigPath
+    ) {
       try {
-        const rawConfig = fs.readFileSync(configPath, "utf8");
+        const rawConfig = fs.readFileSync(currentDirConfigPath, "utf8");
         existingConfig = JSON.parse(rawConfig);
-        console.log(chalk.blue("Found existing configuration, merging..."));
+        console.log(
+          chalk.blue(
+            "Found existing configuration in current directory, using exclusions..."
+          )
+        );
         console.log(
           chalk.gray(
-            `Existing excludeFiles: ${JSON.stringify(
+            `Source excludeFiles: ${JSON.stringify(
               existingConfig.excludeFiles || []
             )}`
           )
         );
       } catch (error) {
-        console.warn(
-          chalk.yellow("Could not read existing config, creating new one")
+        console.warn(chalk.yellow("Could not read current directory config"));
+        existingConfig = null;
+      }
+    }
+    // If no config in current directory, check the target project directory
+    if (!existingConfig && fs.existsSync(finalProjectConfigPath)) {
+      try {
+        const rawConfig = fs.readFileSync(finalProjectConfigPath, "utf8");
+        existingConfig = JSON.parse(rawConfig);
+        console.log(
+          chalk.blue(
+            "Found existing configuration in project directory, merging..."
+          )
         );
+        console.log(
+          chalk.gray(
+            `Project excludeFiles: ${JSON.stringify(
+              existingConfig.excludeFiles || []
+            )}`
+          )
+        );
+      } catch (error) {
+        console.warn(chalk.yellow("Could not read project config"));
         existingConfig = null;
       }
     }
+    // If still no existing config found
+    if (!existingConfig) {
+      console.log(
+        chalk.blue("No existing configuration found, creating new one...")
+      );
+    }
     // Merge or create configuration
     mergeConfigurationFiles(
       projectPath,

package/package.json

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