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

package/dist/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 import { execSync, spawnSync } from "child_process";
 import fs from "fs";
 import { fileURLToPath } from "url";
@@ -1811,42 +1811,122 @@ async function main() {
     }
     // Check for existing config to merge with
     let existingConfig = null;
-    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(currentDirConfigPath, "utf8");
-        existingConfig = JSON.parse(rawConfig);
-        console.log(
-          chalk.blue(
-            "Found existing configuration in current directory, using exclusions..."
-          )
+    // Function to find prisma-php.json files with excludeFiles
+    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() &&
+          (!preferredProjectName ||
+            entry.name.toLowerCase() !== preferredProjectName.toLowerCase())
+        ) {
+          const subConfigPath = path.join(
+            searchDir,
+            entry.name,
+            "prisma-php.json"
+          );
+          if (fs.existsSync(subConfigPath)) {
+            try {
+              const config = JSON.parse(fs.readFileSync(subConfigPath, "utf8"));
+              if (config.excludeFiles && config.excludeFiles.length > 0) {
+                console.log(
+                  chalk.blue(
+                    `Found fallback configuration with exclusions in: ${entry.name}/`
+                  )
+                );
+                console.log(
+                  chalk.gray(
+                    `Fallback excludeFiles: ${JSON.stringify(
+                      config.excludeFiles
+                    )}`
+                  )
+                );
+                return config;
+              }
+            } catch (error) {
+              console.warn(
+                chalk.yellow(`Could not read config in ${entry.name}/`)
+              );
+            }
+          }
+        }
+      }
+      return null;
+    };
+    // 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(
-            `Source excludeFiles: ${JSON.stringify(
-              existingConfig.excludeFiles || []
-            )}`
+            `Looking for local project matching: ${preferredProjectName}`
           )
         );
-      } catch (error) {
-        console.warn(chalk.yellow("Could not read current directory config"));
-        existingConfig = null;
       }
+      existingConfig = findConfigWithExclusions(
+        currentDir,
+        preferredProjectName
+      );
     }
-    // If no config in current directory, check the target project directory
+    // If still no config, 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..."
-          )
+          chalk.blue("Found existing configuration in project directory")
         );
         console.log(
           chalk.gray(

package/dist/prisma-php.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 import chalk from"chalk";import{spawn}from"child_process";import fs from"fs";import path from"path";import prompts from"prompts";const args=process.argv.slice(2),readJsonFile=e=>{const o=fs.readFileSync(e,"utf8");return JSON.parse(o)},executeCommand=(e,o=[],t={})=>new Promise(((r,s)=>{const a=spawn(e,o,{stdio:"inherit",shell:!0,...t});a.on("error",(e=>{s(e)})),a.on("close",(e=>{0===e?r():s(new Error(`Process exited with code ${e}`))}))}));async function getAnswer(){const e=[{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:!1,active:"Yes",inactive:"No"}],o=await prompts(e,{onCancel:()=>{process.exit(0)}});return 0===Object.keys(o).length?null:o}const commandsToExecute={update:"npx pp update project"};
 const main = async () => {
   if (args.length === 0) {

package/package.json

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