create-projx 1.1.2 → 1.2.0

package/README.md

@@ -54,32 +54,49 @@ Interactive prompt lets you pick components. Or specify them directly:
 npx create-projx my-app --components fastapi,fastify,frontend,mobile,e2e,infra
 ```
 
-### Add Components Later
+### Adopt an Existing Project
+
+Already have a project? Initialize projx to get the scaffolding (CI, hooks, docker-compose) without overwriting your code:
+
+```bash
+cd my-existing-app
+npx create-projx init
+```
 
-Already have a project? Add more components anytime:
+Auto-detects components by scanning for `fastapi` in pyproject.toml, `react`/`fastify` in package.json, `flutter` in pubspec.yaml, and `.tf` files. Confirms each mapping, writes `.projx-component` markers, and generates only missing shared files. Existing files get a diff/overwrite/skip prompt.
+
+### Add Components Later
 
 ```bash
 cd my-app
 npx create-projx add frontend mobile
 ```
 
-This copies the new component directories, regenerates shared files (docker-compose, CI, pre-commit hooks) to include them, and installs dependencies.
+Copies the new component directories, regenerates shared files (docker-compose, CI, pre-commit hooks) to include them, and installs dependencies.
 
 ### Update Scaffolding
 
-When we improve templates, update your project's scaffolding without touching your code:
+When templates improve, update your project:
 
 ```bash
 cd my-app
 npx create-projx@latest update
 ```
 
-This updates template files (base models, middleware, configs, Dockerfiles, CI) tracked in `.projx` manifest. Files you created (new entities, pages, features) are never touched.
+Creates a `projx/update-vX.X.X` branch with the latest template overlay. Your custom files are never deleted — only template files are added or replaced. Merge with conflict resolution:
+
+```bash
+git diff main...projx/update-v1.1.2    # review changes
+git checkout main && git merge --no-ff projx/update-v1.1.2  # merge with conflicts
+```
+
+Git shows conflicts on files you customized (controllers, middleware, configs). You keep your code, accept template improvements.
 
 ## Options
 
 ```
 npx create-projx <name> [options]
+npx create-projx init
 npx create-projx add <components...>
 npx create-projx update
 
@@ -90,19 +107,34 @@ npx create-projx update
 -h, --help             Show help
 ```
 
+## Rename Component Directories
+
+Rename `fastapi/` to `backend/`? Just rename the folder — the `.projx-component` marker file moves with it. The `update` command auto-discovers where each component lives by scanning for these markers. No config changes needed.
+
+```
+backend/.projx-component  →  { "components": ["fastapi"] }
+web/.projx-component      →  { "components": ["frontend"] }
+```
+
+CI, setup.sh, pre-commit hooks, and docker-compose are all regenerated with your custom directory names.
+
 ## What a Scaffolded Project Looks Like
 
 ```
 my-app/
-├── fastapi/              # Auto-entity CRUD backend
-├── frontend/             # Auto-entity UI from /_meta
-├── e2e/                  # Playwright E2E tests
-├── docker-compose.yml    # Production (backend + frontend + SSL)
-├── docker-compose.dev.yml # Development (PostgreSQL + hot reload)
-├── .github/workflows/    # CI per component
-├── .githooks/pre-commit  # Format + lint on commit
-├── setup.sh              # Install all deps
-└── .projx                # Manifest (tracks template files for updates)
+├── fastapi/                # Auto-entity CRUD backend
+│   └── .projx-component    # Identifies this as the fastapi component
+├── frontend/               # Auto-entity UI from /_meta
+│   └── .projx-component
+├── e2e/                    # Playwright E2E tests
+│   └── .projx-component
+├── docker-compose.yml      # Production (backend + frontend + SSL)
+├── docker-compose.dev.yml  # Development (PostgreSQL + hot reload)
+├── .github/workflows/      # CI per component (runs only on changes)
+├── .githooks/pre-commit    # Format + lint on commit
+├── .vscode/                # Editor settings + recommended extensions
+├── setup.sh                # Install all deps
+└── .projx                  # Components list + version
 ```
 
 Only the components you selected appear. Shared files (docker-compose, CI, hooks) are generated to match your selection.
@@ -121,9 +153,10 @@ The core idea: define a data model, get everything else for free.
 
 - JWT auth with Keycloak (pluggable providers)
 - Docker Compose for dev and prod
-- GitHub Actions CI per component
+- GitHub Actions CI per component (path-filtered — only runs when that component changes)
 - Pre-commit hooks (format + lint + typecheck)
 - Secret detection in pre-commit
+- VS Code settings + recommended extensions
 - 80% test coverage enforced
 - Auto-entity discovery across all stacks
 
@@ -139,6 +172,12 @@ cd projx
 
 The CLI lives in `cli/`. Templates are the root-level component directories (`fastapi/`, `frontend/`, etc.).
 
+```bash
+cd cli
+npm test        # run tests
+npm run build   # build CLI
+```
+
 ## License
 
 MIT

package/dist/index.js

@@ -437,8 +437,7 @@ async function doScaffold(opts, dest, repoDir, name, nameSnake, vars) {
   const projxConfig = {
     version: pkg.version,
     components: opts.components,
-    createdAt: (/* @__PURE__ */ new Date()).toISOString().split("T")[0],
-    paths: vars.paths
+    createdAt: (/* @__PURE__ */ new Date()).toISOString().split("T")[0]
   };
   await writeFile2(join3(dest, ".projx"), JSON.stringify(projxConfig, null, 2));
   if (opts.git) {
@@ -592,10 +591,6 @@ 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" });
@@ -700,8 +695,8 @@ async function update(cwd, localRepo) {
   Review changes:
     git diff ${originalBranch}...${branchName}
 
-  Switch back and merge:
-    git checkout ${originalBranch} && git merge ${branchName}`
+  Merge (resolve conflicts for files you customized):
+    git checkout ${originalBranch} && git merge --no-ff ${branchName}`
     );
   } else {
     const dlSpinner = p3.spinner();
@@ -752,16 +747,8 @@ 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 });
-      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 cp2(src, dest, { force: true });
+      touchedFiles.push(destRel);
     }
     await rm2(tmpDest, { recursive: true, force: true });
     if (!existsSync3(join4(cwd, targetDir, ".projx-component"))) {
@@ -805,8 +792,7 @@ async function doUpdate(cwd, config, repoDir, version, componentPaths) {
   const updatedConfig = {
     version,
     components: config.components,
-    createdAt: config.createdAt,
-    paths: componentPaths
+    createdAt: config.createdAt
   };
   await writeFile3(join4(cwd, ".projx"), JSON.stringify(updatedConfig, null, 2));
   touchedFiles.push(".projx");
@@ -831,63 +817,6 @@ 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";
@@ -979,8 +908,7 @@ async function doAdd(cwd, config, toAdd, repoDir, skipInstall) {
   const updatedConfig = {
     version: pkg.version,
     components: allComponents,
-    createdAt: config.createdAt,
-    paths
+    createdAt: config.createdAt
   };
   await writeFile4(join5(cwd, ".projx"), JSON.stringify(updatedConfig, null, 2));
   p4.outro(`Added ${toAdd.join(", ")}. Shared files updated for all ${allComponents.length} components.
@@ -1314,8 +1242,7 @@ async function init(cwd, localRepo) {
     const projxConfig = {
       version: pkg.version,
       components,
-      createdAt: (/* @__PURE__ */ new Date()).toISOString().split("T")[0],
-      paths
+      createdAt: (/* @__PURE__ */ new Date()).toISOString().split("T")[0]
     };
     await writeFile5(join7(cwd, ".projx"), JSON.stringify(projxConfig, null, 2));
     p5.log.success(".projx");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-projx",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "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": {