create-prisma-php-app 4.0.0-alpha.41 → 4.0.0-alpha.45

package/dist/index.js

@@ -1813,10 +1813,58 @@ async function main() {
     let existingConfig = null;
     const finalProjectConfigPath = path.join(projectPath, "prisma-php.json");
     // Function to find prisma-php.json files with excludeFiles
-    const findConfigWithExclusions = (searchDir) => {
+    const findConfigWithExclusions = (searchDir, preferredProjectName) => {
       const entries = fs.readdirSync(searchDir, { withFileTypes: true });
+      // First, try to find the preferred project directory
+      if (preferredProjectName) {
+        const preferredEntry = entries.find(
+          (entry) =>
+            entry.isDirectory() &&
+            entry.name.toLowerCase() === preferredProjectName.toLowerCase()
+        );
+        if (preferredEntry) {
+          const preferredConfigPath = path.join(
+            searchDir,
+            preferredEntry.name,
+            "prisma-php.json"
+          );
+          if (fs.existsSync(preferredConfigPath)) {
+            try {
+              const config = JSON.parse(
+                fs.readFileSync(preferredConfigPath, "utf8")
+              );
+              if (config.excludeFiles && config.excludeFiles.length > 0) {
+                console.log(
+                  chalk.blue(
+                    `Found preferred configuration with exclusions in: ${preferredEntry.name}/`
+                  )
+                );
+                console.log(
+                  chalk.gray(
+                    `Preferred excludeFiles: ${JSON.stringify(
+                      config.excludeFiles
+                    )}`
+                  )
+                );
+                return config;
+              }
+            } catch (error) {
+              console.warn(
+                chalk.yellow(
+                  `Could not read preferred config in ${preferredEntry.name}/`
+                )
+              );
+            }
+          }
+        }
+      }
+      // If no preferred project found, search all directories
       for (const entry of entries) {
-        if (entry.isDirectory()) {
+        if (
+          entry.isDirectory() &&
+          (!preferredProjectName ||
+            entry.name.toLowerCase() !== preferredProjectName.toLowerCase())
+        ) {
           const subConfigPath = path.join(
             searchDir,
             entry.name,
@@ -1828,12 +1876,14 @@ async function main() {
               if (config.excludeFiles && config.excludeFiles.length > 0) {
                 console.log(
                   chalk.blue(
-                    `Found configuration with exclusions in: ${entry.name}/`
+                    `Found fallback configuration with exclusions in: ${entry.name}/`
                   )
                 );
                 console.log(
                   chalk.gray(
-                    `Found excludeFiles: ${JSON.stringify(config.excludeFiles)}`
+                    `Fallback excludeFiles: ${JSON.stringify(
+                      config.excludeFiles
+                    )}`
                   )
                 );
                 return config;
@@ -1848,35 +1898,27 @@ async function main() {
       }
       return null;
     };
-    // First, look in current directory for prisma-php.json
-    const currentDirConfigPath = path.join(currentDir, "prisma-php.json");
-    if (
-      fs.existsSync(currentDirConfigPath) &&
-      currentDirConfigPath !== finalProjectConfigPath
-    ) {
-      try {
-        const rawConfig = fs.readFileSync(currentDirConfigPath, "utf8");
-        existingConfig = JSON.parse(rawConfig);
-        console.log(
-          chalk.blue("Found existing configuration in current directory")
-        );
+    // If no config in current directory, search subdirectories for configs with excludeFiles
+    if (!existingConfig) {
+      console.log(
+        chalk.blue("Searching for existing configurations with exclusions...")
+      );
+      // Extract project name from starter kit source URL to prioritize the right project
+      let preferredProjectName;
+      if (answer.starterKitSource) {
+        const urlParts = answer.starterKitSource.split("/");
+        const repoName = urlParts[urlParts.length - 1].replace(".git", "");
+        preferredProjectName = repoName;
         console.log(
           chalk.gray(
-            `Current dir excludeFiles: ${JSON.stringify(
-              existingConfig.excludeFiles || []
-            )}`
+            `Looking for local project matching: ${preferredProjectName}`
           )
         );
-      } catch (error) {
-        console.warn(chalk.yellow("Could not read current directory config"));
       }
-    }
-    // If no config in current directory, search subdirectories for configs with excludeFiles
-    if (!existingConfig) {
-      console.log(
-        chalk.blue("Searching for existing configurations with exclusions...")
+      existingConfig = findConfigWithExclusions(
+        currentDir,
+        preferredProjectName
       );
-      existingConfig = findConfigWithExclusions(currentDir);
     }
     // If still no config, check the target project directory
     if (!existingConfig && fs.existsSync(finalProjectConfigPath)) {

package/package.json

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