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

package/dist/index.js

@@ -411,7 +411,7 @@ async function createOrUpdateEnvFile(baseDir, content) {
   fs.writeFileSync(envPath, content, { flag: "w" });
 }
 function checkExcludeFiles(destPath) {
-  if (!updateAnswer) return false;
+  if (!updateAnswer?.isUpdate) return false;
   return (
     updateAnswer?.excludeFilePath?.includes(destPath.replace(/\\/g, "/")) ??
     false
@@ -1061,9 +1061,39 @@ async function downloadStarterKit(starterKit, tempDir) {
 }
 async function mergeStarterKitFiles(starterKitPath, projectPath, answer) {
   console.log(chalk.blue("Merging starter kit files..."));
-  // Use the new copy function that respects exclusions
-  copyRecursiveSyncWithExclusions(starterKitPath, projectPath, answer, true);
-  // Look for starter kit specific configuration
+  // First, check if starter kit has a prisma-php.json to preserve excludeFiles
+  const starterKitConfigPath = path.join(starterKitPath, "prisma-php.json");
+  let starterKitExcludeFiles = [];
+  if (fs.existsSync(starterKitConfigPath)) {
+    try {
+      const starterKitConfig = JSON.parse(
+        fs.readFileSync(starterKitConfigPath, "utf8")
+      );
+      starterKitExcludeFiles = starterKitConfig.excludeFiles || [];
+      console.log(
+        chalk.blue(
+          `Found ${starterKitExcludeFiles.length} excluded files in starter kit`
+        )
+      );
+    } catch (error) {
+      console.warn(chalk.yellow("Failed to parse starter kit prisma-php.json"));
+    }
+  }
+  // Temporarily store excludeFiles for the copy process
+  const tempUpdateAnswer = updateAnswer;
+  updateAnswer = {
+    ...answer,
+    isUpdate: false, // Treat as new project for copying
+    excludeFiles: starterKitExcludeFiles,
+    excludeFilePath: starterKitExcludeFiles.map((file) =>
+      path.join(projectPath, file).replace(/\\/g, "/")
+    ),
+  };
+  // Copy all files from starter kit
+  copyRecursiveSync(starterKitPath, projectPath, answer);
+  // Restore original updateAnswer
+  updateAnswer = tempUpdateAnswer;
+  // Handle starter kit specific configuration
   const starterKitConfig = path.join(starterKitPath, "starter-kit.json");
   if (fs.existsSync(starterKitConfig)) {
     const config = JSON.parse(fs.readFileSync(starterKitConfig, "utf8"));
@@ -1090,6 +1120,18 @@ async function mergeStarterKitFiles(starterKitPath, projectPath, answer) {
       );
     }
   }
+  // Store the excludeFiles for later use in main()
+  if (starterKitExcludeFiles.length > 0) {
+    // Create a temporary marker file to pass excludeFiles to main()
+    const tempConfigPath = path.join(
+      projectPath,
+      ".temp-starter-kit-config.json"
+    );
+    fs.writeFileSync(
+      tempConfigPath,
+      JSON.stringify({ excludeFiles: starterKitExcludeFiles })
+    );
+  }
 }
 async function setupStarterKit(baseDir, answer) {
   if (!answer.starterKit) return;
@@ -1183,168 +1225,6 @@ function showStarterKits() {
   );
   console.log();
 }
-// Starter kit specific copy function that respects exclusions
-function copyRecursiveSyncWithExclusions(
-  src,
-  dest,
-  answer,
-  respectExclusions = true
-) {
-  const exists = fs.existsSync(src);
-  const stats = exists && fs.statSync(src);
-  const isDirectory = exists && stats && stats.isDirectory();
-  if (isDirectory) {
-    const destLower = dest.toLowerCase();
-    // Apply feature-based exclusions
-    if (!answer.websocket && destLower.includes("websocket")) return;
-    if (!answer.mcp && destLower.includes("mcp")) return;
-    if (!answer.swaggerDocs && destLower.includes("swagger-docs")) return;
-    if (
-      answer.backendOnly &&
-      (destLower.includes("js") ||
-        destLower.includes("css") ||
-        destLower.includes("assets"))
-    )
-      return;
-    // Apply user-defined exclusions
-    const destModified = dest.replace(/\\/g, "/");
-    if (
-      respectExclusions &&
-      updateAnswer?.excludeFilePath?.includes(destModified)
-    ) {
-      console.log(chalk.yellow(`Skipping excluded directory: ${destModified}`));
-      return;
-    }
-    if (!fs.existsSync(dest)) fs.mkdirSync(dest, { recursive: true });
-    fs.readdirSync(src).forEach((childItemName) => {
-      copyRecursiveSyncWithExclusions(
-        path.join(src, childItemName),
-        path.join(dest, childItemName),
-        answer,
-        respectExclusions
-      );
-    });
-  } 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(
-        chalk.yellow(`Skipping excluded file: ${dest.replace(/\\/g, "/")}`)
-      );
-      return;
-    }
-    // Apply feature-based exclusions
-    if (
-      !answer.tailwindcss &&
-      (dest.includes("tailwind.css") || dest.includes("styles.css"))
-    )
-      return;
-    if (!answer.websocket && dest.includes("restart-websocket.ts")) return;
-    if (!answer.mcp && dest.includes("restart-mcp.ts")) return;
-    if (!answer.docker && dockerFiles.some((file) => dest.includes(file)))
-      return;
-    if (
-      answer.backendOnly &&
-      nonBackendFiles.some((file) => dest.includes(file))
-    )
-      return;
-    if (!answer.backendOnly && dest.includes("route.php")) return;
-    if (
-      answer.backendOnly &&
-      !answer.swaggerDocs &&
-      dest.includes("layout.php")
-    )
-      return;
-    if (!answer.swaggerDocs && dest.includes("swagger-config.ts")) return;
-    if (answer.tailwindcss && dest.includes("index.css")) return;
-    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) {
-    console.log(chalk.blue("Merging with existing configuration..."));
-    console.log(
-      chalk.gray(
-        `Preserving excludeFiles: ${JSON.stringify(
-          existingConfig.excludeFiles || []
-        )}`
-      )
-    );
-    const mergedConfig = {
-      ...existingConfig, // Start with existing config to preserve all existing fields
-      // Only update specific fields that should be updated for starter kits
-      projectName: answer.projectName,
-      projectRootPath: projectPathModified,
-      bsTarget: bsConfig.bsTarget,
-      bsPathRewrite: bsConfig.bsPathRewrite,
-      version: latestVersion,
-      // Update feature flags based on starter kit
-      backendOnly: answer.backendOnly,
-      swaggerDocs: answer.swaggerDocs,
-      tailwindcss: answer.tailwindcss,
-      websocket: answer.websocket,
-      mcp: answer.mcp,
-      prisma: answer.prisma,
-      docker: answer.docker,
-      // CRITICAL: Always preserve existing excludeFiles
-      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!"));
-    console.log(
-      chalk.green(
-        `✓ Preserved ${
-          (existingConfig.excludeFiles || []).length
-        } excluded files`
-      )
-    );
-  } else {
-    console.log(chalk.blue("Creating new configuration..."));
-    // 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" }
-    );
-    console.log(chalk.green("✓ New configuration created"));
-  }
-}
 async function main() {
   try {
     const args = process.argv.slice(2);
@@ -1366,31 +1246,16 @@ async function main() {
     if (projectName) {
       const currentDir = process.cwd();
       const configPath = path.join(currentDir, "prisma-php.json");
-      const projectNamePath = path.join(currentDir, projectName);
-      const projectNameConfigPath = path.join(
-        projectNamePath,
-        "prisma-php.json"
-      );
-      // Check if there's an existing config in current directory or project directory
-      let existingConfigPath = null;
       if (fs.existsSync(configPath)) {
-        existingConfigPath = configPath;
-      } else if (fs.existsSync(projectNameConfigPath)) {
-        existingConfigPath = projectNameConfigPath;
-      }
-      // If we found an existing config and we're using a starter kit, load exclusions
-      if (existingConfigPath && (starterKitFromArgs || starterKitSource)) {
-        const localSettings = readJsonFile(existingConfigPath);
+        // It's an update - read existing settings
+        const localSettings = readJsonFile(configPath);
         let excludeFiles = [];
         localSettings.excludeFiles?.map((file) => {
-          const filePath = path.join(
-            existingConfigPath === configPath ? currentDir : projectNamePath,
-            file
-          );
+          const filePath = path.join(currentDir, file);
           if (fs.existsSync(filePath))
             excludeFiles.push(filePath.replace(/\\/g, "/"));
         });
-        // Set updateAnswer to respect exclusions during starter kit setup
+        // Set updateAnswer with OLD settings initially (for checkExcludeFiles function)
         updateAnswer = {
           projectName,
           backendOnly: localSettings.backendOnly,
@@ -1400,11 +1265,10 @@ async function main() {
           mcp: localSettings.mcp,
           prisma: localSettings.prisma,
           docker: localSettings.docker,
-          isUpdate: false, // Not a true update, but we need exclusions to work
+          isUpdate: true,
           excludeFiles: localSettings.excludeFiles ?? [],
           excludeFilePath: excludeFiles ?? [],
-          filePath:
-            existingConfigPath === configPath ? currentDir : projectNamePath,
+          filePath: currentDir,
         };
         // For updates, use existing settings but allow CLI overrides
         const predefinedAnswers = {
@@ -1524,10 +1388,6 @@ async function main() {
       projectPath = path.join(currentDir, answer.projectName);
       process.chdir(answer.projectName);
     }
-    // Add starter kit setup before npm/composer installation
-    if (answer.starterKit) {
-      await setupStarterKit(projectPath, answer);
-    }
     let npmDependencies = [
       npmPkg("typescript"),
       npmPkg("@types/node"),
@@ -1576,6 +1436,10 @@ async function main() {
     if (answer.prisma) {
       execSync("npm install -g prisma-client-php", { stdio: "inherit" });
     }
+    // Add starter kit setup before npm/composer installation
+    if (answer.starterKit) {
+      await setupStarterKit(projectPath, answer);
+    }
     await installNpmDependencies(projectPath, npmDependencies, true);
     await installComposerDependencies(projectPath, composerDependencies);
     if (!projectName) {
@@ -1809,149 +1673,47 @@ async function main() {
         await uninstallComposerDependencies(projectPath, composerToUninstall);
       }
     }
-    // Check for existing config to merge with
-    let existingConfig = null;
-    const finalProjectConfigPath = path.join(projectPath, "prisma-php.json");
-    // 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(
-            `Looking for local project matching: ${preferredProjectName}`
-          )
-        );
-      }
-      existingConfig = findConfigWithExclusions(
-        currentDir,
-        preferredProjectName
-      );
-    }
-    // If still no config, check the target project directory
-    if (!existingConfig && fs.existsSync(finalProjectConfigPath)) {
+    const projectPathModified = projectPath.replace(/\\/g, "\\");
+    const bsConfig = bsConfigUrls(projectPathModified);
+    let starterKitExcludeFiles = [];
+    const tempConfigPath = path.join(
+      projectPath,
+      ".temp-starter-kit-config.json"
+    );
+    if (fs.existsSync(tempConfigPath)) {
       try {
-        const rawConfig = fs.readFileSync(finalProjectConfigPath, "utf8");
-        existingConfig = JSON.parse(rawConfig);
-        console.log(
-          chalk.blue("Found existing configuration in project directory")
-        );
-        console.log(
-          chalk.gray(
-            `Project excludeFiles: ${JSON.stringify(
-              existingConfig.excludeFiles || []
-            )}`
-          )
-        );
+        const tempConfig = JSON.parse(fs.readFileSync(tempConfigPath, "utf8"));
+        starterKitExcludeFiles = tempConfig.excludeFiles || [];
+        fs.unlinkSync(tempConfigPath); // Clean up temp file
       } catch (error) {
-        console.warn(chalk.yellow("Could not read project config"));
-        existingConfig = null;
+        console.warn("Failed to read temp starter kit config");
       }
     }
-    // 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,
-      answer,
-      latestVersionOfCreatePrismaPhpApp,
-      existingConfig
+    // Then update the prismaPhpConfig creation:
+    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:
+        starterKitExcludeFiles.length > 0
+          ? starterKitExcludeFiles
+          : updateAnswer?.excludeFiles ?? [],
+    };
+    fs.writeFileSync(
+      path.join(projectPath, "prisma-php.json"),
+      JSON.stringify(prismaPhpConfig, null, 2),
+      { flag: "w" }
     );
     if (updateAnswer?.isUpdate) {
       execSync(

package/package.json

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