create-projx 1.1.1 → 1.1.2

package/dist/index.js

@@ -592,6 +592,10 @@ var NEVER_OVERWRITE = [
   /src\/migrations\/versions\//,
   /\.projx-component$/
 ];
+var MERGE_DEPS = [
+  /^[^/]+\/package\.json$/,
+  /^[^/]+\/pyproject\.toml$/
+];
 function isGitRepo(cwd) {
   try {
     execSync2("git rev-parse --is-inside-work-tree", { cwd, stdio: "pipe" });
@@ -680,13 +684,16 @@ async function update(cwd, localRepo) {
     }
     execSync2(`git checkout -b ${branchName}`, { cwd, stdio: "pipe" });
     p3.log.info(`Created branch: ${branchName}`);
+    let touchedFiles;
     try {
-      await doUpdate(cwd, config, repoDir, pkg.version, componentPaths);
+      touchedFiles = await doUpdate(cwd, config, repoDir, pkg.version, componentPaths);
     } finally {
       await cleanupRepo(repoDir, isLocal);
     }
-    execSync2("git add -A", { cwd, stdio: "pipe" });
-    execSync2(`git commit -m "projx update to v${pkg.version}"`, { cwd, stdio: "pipe" });
+    for (const f of touchedFiles) {
+      execSync2(`git add "${f}"`, { cwd, stdio: "pipe" });
+    }
+    execSync2(`git commit --no-verify -m "projx update to v${pkg.version}"`, { cwd, stdio: "pipe" });
     p3.outro(
       `Updated on branch: ${branchName}
 
@@ -720,8 +727,15 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
   const name = detectProjectName(cwd, config.components, componentPaths);
   const nameSnake = toSnake(name);
   const vars = { projectName: name, components: config.components, paths: componentPaths };
+  const touchedFiles = [];
+  const usedPaths = /* @__PURE__ */ new Set();
   for (const component of config.components) {
     const targetDir = componentPaths[component];
+    if (usedPaths.has(targetDir)) {
+      p3.log.warn(`${component} shares directory ${targetDir}/ with another component \u2014 skipping overlay to avoid nesting.`);
+      continue;
+    }
+    usedPaths.add(targetDir);
     const spinner6 = p3.spinner();
     spinner6.start(`Updating ${targetDir}/ (${component})`);
     const componentSrc = join4(repoDir, component);
@@ -738,11 +752,21 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
       if (NEVER_OVERWRITE.some((re) => re.test(destRel))) continue;
       const dir = dest.substring(0, dest.lastIndexOf("/"));
       await mkdir3(dir, { recursive: true });
-      await cp2(src, dest, { force: true });
+      if (MERGE_DEPS.some((re) => re.test(destRel)) && existsSync3(dest)) {
+        const merged = await mergeDeps(dest, src);
+        if (merged) {
+          await writeFile3(dest, merged);
+          touchedFiles.push(destRel);
+        }
+      } else {
+        await cp2(src, dest, { force: true });
+        touchedFiles.push(destRel);
+      }
     }
     await rm2(tmpDest, { recursive: true, force: true });
     if (!existsSync3(join4(cwd, targetDir, ".projx-component"))) {
       await writeComponentMarker(join4(cwd, targetDir), component);
+      touchedFiles.push(`${targetDir}/.projx-component`);
     }
     spinner6.stop(`${targetDir}/ updated.`);
   }
@@ -750,29 +774,24 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
   spinner5.start("Updating shared files");
   const hasBackend = config.components.includes("fastapi") || config.components.includes("fastify");
   if (hasBackend || config.components.includes("frontend")) {
-    await writeFile3(
-      join4(cwd, "docker-compose.yml"),
-      await generateDockerCompose(vars)
-    );
-    await writeFile3(
-      join4(cwd, "docker-compose.dev.yml"),
-      await generateDockerComposeDev(vars)
-    );
+    await writeFile3(join4(cwd, "docker-compose.yml"), await generateDockerCompose(vars));
+    touchedFiles.push("docker-compose.yml");
+    await writeFile3(join4(cwd, "docker-compose.dev.yml"), await generateDockerComposeDev(vars));
+    touchedFiles.push("docker-compose.dev.yml");
   }
   await mkdir3(join4(cwd, ".githooks"), { recursive: true });
-  const preCommit = await generatePreCommit(vars);
-  await writeFile3(join4(cwd, ".githooks/pre-commit"), preCommit);
+  await writeFile3(join4(cwd, ".githooks/pre-commit"), await generatePreCommit(vars));
   await chmod2(join4(cwd, ".githooks/pre-commit"), 493);
+  touchedFiles.push(".githooks/pre-commit");
   await mkdir3(join4(cwd, ".github/workflows"), { recursive: true });
-  await writeFile3(
-    join4(cwd, ".github/workflows/ci.yml"),
-    await generateCiYml(vars)
-  );
-  const setupSh = await generateSetupSh(vars);
-  await writeFile3(join4(cwd, "setup.sh"), setupSh);
+  await writeFile3(join4(cwd, ".github/workflows/ci.yml"), await generateCiYml(vars));
+  touchedFiles.push(".github/workflows/ci.yml");
+  await writeFile3(join4(cwd, "setup.sh"), await generateSetupSh(vars));
   await chmod2(join4(cwd, "setup.sh"), 493);
+  touchedFiles.push("setup.sh");
   await mkdir3(join4(cwd, ".vscode"), { recursive: true });
   await writeFile3(join4(cwd, ".vscode/settings.json"), generateVscodeSettings(vars));
+  touchedFiles.push(".vscode/settings.json");
   spinner5.stop("Shared files updated.");
   if (config.components.includes("mobile")) {
     const mobilePath = componentPaths.mobile ?? "mobile";
@@ -790,6 +809,8 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
     paths: componentPaths
   };
   await writeFile3(join4(cwd, ".projx"), JSON.stringify(updatedConfig, null, 2));
+  touchedFiles.push(".projx");
+  return touchedFiles;
 }
 function detectProjectName(cwd, components, componentPaths) {
   for (const component of components) {
@@ -810,6 +831,63 @@ function detectProjectName(cwd, components, componentPaths) {
   }
   return toKebab(cwd.split("/").pop());
 }
+async function mergeDeps(existingPath, templatePath) {
+  if (existingPath.endsWith("package.json")) {
+    return mergePackageJson(existingPath, templatePath);
+  }
+  if (existingPath.endsWith("pyproject.toml")) {
+    return mergePyprojectToml(existingPath, templatePath);
+  }
+  return null;
+}
+async function mergePackageJson(existingPath, templatePath) {
+  const existingRaw = await readFileOrNull(existingPath);
+  const templateRaw = await readFileOrNull(templatePath);
+  if (!existingRaw || !templateRaw) return null;
+  try {
+    const existing = JSON.parse(existingRaw);
+    const template = JSON.parse(templateRaw);
+    if (template.dependencies) {
+      existing.dependencies = { ...template.dependencies, ...existing.dependencies };
+    }
+    if (template.devDependencies) {
+      existing.devDependencies = { ...template.devDependencies, ...existing.devDependencies };
+    }
+    if (template.scripts) {
+      existing.scripts = { ...template.scripts, ...existing.scripts };
+    }
+    return JSON.stringify(existing, null, 2) + "\n";
+  } catch {
+    return null;
+  }
+}
+async function mergePyprojectToml(existingPath, templatePath) {
+  const existingRaw = await readFileOrNull(existingPath);
+  const templateRaw = await readFileOrNull(templatePath);
+  if (!existingRaw || !templateRaw) return null;
+  const templateDeps = extractTomlDeps(templateRaw);
+  if (templateDeps.length === 0) return null;
+  const existingDeps = extractTomlDeps(existingRaw);
+  const existingNames = new Set(existingDeps.map((d) => d.replace(/[><=!~[].*/, "").trim().toLowerCase()));
+  const newDeps = templateDeps.filter((d) => {
+    const name = d.replace(/[><=!~[].*/, "").trim().toLowerCase();
+    return !existingNames.has(name);
+  });
+  if (newDeps.length === 0) return null;
+  const depsMatch = existingRaw.match(/^dependencies\s*=\s*\[([^\]]*)\]/m);
+  if (!depsMatch) return null;
+  const closingBracket = existingRaw.indexOf("]", depsMatch.index);
+  const before = existingRaw.slice(0, closingBracket);
+  const after = existingRaw.slice(closingBracket);
+  const indent = "  ";
+  const newLines = newDeps.map((d) => `${indent}"${d}",`).join("\n");
+  return before.trimEnd() + "\n" + newLines + "\n" + after;
+}
+function extractTomlDeps(toml) {
+  const match = toml.match(/^dependencies\s*=\s*\[([\s\S]*?)\]/m);
+  if (!match) return [];
+  return match[1].split("\n").map((l) => l.trim()).filter((l) => l.startsWith('"') || l.startsWith("'")).map((l) => l.replace(/^["']|["'],?$/g, "").trim()).filter(Boolean);
+}
 
 // src/add.ts
 import { copyFileSync as copyFileSync2, existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-projx",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Scaffold production-grade projects. Pick your stack (FastAPI, Fastify, React, Flutter), get a fully wired template with auth, database, CI/CD, and E2E tests.",
   "type": "module",
   "bin": {