create-projx 1.6.2 → 1.6.4

package/README.md

@@ -39,7 +39,7 @@ Ask an LLM to "scaffold a full-stack app" and you get 50 files of plausible-look
 ```bash
 npx create-projx my-app       # interactive — pick exactly what you need
 cd my-app
-./setup.sh                    # installs everything you picked
+./scripts/setup.sh            # installs everything you picked
 ```
 
 Pick any combination of components — they're all optional:
@@ -116,7 +116,7 @@ npx create-projx my-app -y
 
 ## Package Manager Support
 
-Projx supports **npm**, **pnpm**, **yarn**, and **bun**. During `create`, you're prompted to pick one. The choice is stored in `.projx` and used everywhere — setup.sh, Docker, CI, pre-commit hooks, and README.
+Projx supports **npm**, **pnpm**, **yarn**, and **bun**. During `create`, you're prompted to pick one. The choice is stored in `.projx` and used everywhere — `scripts/setup.sh`, Docker, CI, pre-commit hooks, and README.
 
 ```json
 { "packageManager": "pnpm" }
@@ -158,6 +158,16 @@ npx create-projx add frontend mobile
 
 Copies the new component directories, regenerates shared files (docker-compose, CI, pre-commit hooks) to include them, and installs dependencies.
 
+#### Multiple instances of the same type
+
+Need a second backend service alongside an existing one (e.g. an SMTP listener next to your CRUD API)? Use `--name <dir>`:
+
+```bash
+npx create-projx add fastify --name email-ingestor
+```
+
+Creates `email-ingestor/` with the fastify scaffold and a `.projx-component` marker. Each instance gets its own job in `.github/workflows/ci.yml`, its own section in `.githooks/pre-commit`, and its own install step in `scripts/setup.sh`. `update` keeps every instance refreshed on every run.
+
 ### Update Scaffolding
 
 When templates improve, update your project:
@@ -181,7 +191,7 @@ Common user-owned files are **default-skipped** automatically — template updat
 
 | Scope | Default skips |
 |-------|---------------|
-| Root (`.projx`) | `docker-compose.yml`, `docker-compose.dev.yml`, `README.md`, `.githooks/pre-commit`, `.github/workflows/ci.yml`, `setup.sh` |
+| Root (`.projx`) | `docker-compose.yml`, `docker-compose.dev.yml`, `README.md`, `.githooks/pre-commit`, `.github/workflows/ci.yml`, `scripts/setup.sh`, `scripts/setup-docker.sh`, `scripts/setup-ssl.sh` |
 | fastapi | `pyproject.toml` |
 | fastify / frontend / e2e | `package.json` |
 | mobile | `pubspec.yaml` |
@@ -213,6 +223,7 @@ To opt back in to updates for a skipped file, use `npx create-projx unpin <file>
 npx create-projx <name> [options]
 npx create-projx init
 npx create-projx add <components...>
+npx create-projx add <type> --name <dir>
 npx create-projx update
 npx create-projx diff
 npx create-projx pin <patterns...>
@@ -223,6 +234,7 @@ npx create-projx gen entity <name> [--ai | --backend]
 npx create-projx sync [--url <url>]
 
 --components <list>    Comma-separated: fastapi,fastify,frontend,mobile,e2e,infra
+--name <dir>           Custom directory for `add <type>` (multi-instance)
 --ai                   Target fastapi (AI/ML) for gen entity
 --backend              Target fastify (API backend) for gen entity
 --no-git               Skip git init
@@ -324,7 +336,7 @@ 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.
+CI, `scripts/setup.sh`, pre-commit hooks, and docker-compose are all regenerated with your custom directory names.
 
 ## What a Scaffolded Project Looks Like
 
@@ -341,7 +353,7 @@ my-app/
 ├── .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
+├── scripts/                # setup.sh, setup-docker.sh, setup-ssl.sh
 └── .projx                  # Components list + version
 ```
 
@@ -366,7 +378,7 @@ Contributing to Projx itself:
 ```bash
 git clone https://github.com/ukanhaupa/projx.git
 cd projx
-./setup.sh
+./scripts/setup.sh
 ```
 
 The CLI lives in `cli/`. Templates are the root-level component directories (`fastapi/`, `frontend/`, etc.).

package/dist/{baseline-KTCFW2FK.js → baseline-PZM4KJJW.js}

@@ -1,8 +1,6 @@
 import {
   BASELINE_REF,
   applyTemplate,
-  buildDisplayNames,
-  buildPathsUpper,
   collectAllFiles,
   detectPackageNameOverrides,
   getBaselineRef,
@@ -10,13 +8,11 @@ import {
   matchesSkip,
   saveBaselineRef,
   writeTemplateToDir
-} from "./chunk-D33FXCNT.js";
-import "./chunk-LTIJPVRZ.js";
+} from "./chunk-XQ7FE4U3.js";
+import "./chunk-6YRBHJ2V.js";
 export {
   BASELINE_REF,
   applyTemplate,
-  buildDisplayNames,
-  buildPathsUpper,
   collectAllFiles,
   detectPackageNameOverrides,
   getBaselineRef,

package/dist/{chunk-LTIJPVRZ.js → chunk-6YRBHJ2V.js}

@@ -1,7 +1,15 @@
 // src/utils.ts
 import { execSync } from "child_process";
 import { existsSync, readFileSync } from "fs";
-import { cp, mkdir, readdir, readFile, rm, writeFile } from "fs/promises";
+import {
+  chmod,
+  cp,
+  mkdir,
+  readdir,
+  readFile,
+  rm,
+  writeFile
+} from "fs/promises";
 import { join, resolve } from "path";
 import { tmpdir } from "os";
 import { fileURLToPath } from "url";
@@ -19,13 +27,57 @@ var PACKAGE_MANAGERS = ["npm", "pnpm", "yarn", "bun"];
 function pmCommands(pm) {
   switch (pm) {
     case "npm":
-      return { name: "npm", install: "npm install", ci: "npm ci", run: "npm run", exec: "npx", dlx: "npx", lockfile: "package-lock.json", prismaExec: "npx prisma", runDev: "npm run dev", audit: "npm audit --omit=dev" };
+      return {
+        name: "npm",
+        install: "npm install",
+        ci: "npm ci",
+        run: "npm run",
+        exec: "npx",
+        dlx: "npx",
+        lockfile: "package-lock.json",
+        prismaExec: "npx prisma",
+        runDev: "npm run dev",
+        audit: "npm audit --omit=dev"
+      };
     case "pnpm":
-      return { name: "pnpm", install: "pnpm install", ci: "pnpm install --frozen-lockfile", run: "pnpm", exec: "pnpm exec", dlx: "pnpm dlx", lockfile: "pnpm-lock.yaml", prismaExec: "pnpm prisma", runDev: "pnpm dev", audit: "pnpm audit --prod" };
+      return {
+        name: "pnpm",
+        install: "pnpm install",
+        ci: "pnpm install --frozen-lockfile",
+        run: "pnpm",
+        exec: "pnpm exec",
+        dlx: "pnpm dlx",
+        lockfile: "pnpm-lock.yaml",
+        prismaExec: "pnpm prisma",
+        runDev: "pnpm dev",
+        audit: "pnpm audit --prod"
+      };
     case "yarn":
-      return { name: "yarn", install: "yarn", ci: "yarn --frozen-lockfile", run: "yarn", exec: "yarn", dlx: "yarn dlx", lockfile: "yarn.lock", prismaExec: "yarn prisma", runDev: "yarn dev", audit: "yarn npm audit --environment production" };
+      return {
+        name: "yarn",
+        install: "yarn",
+        ci: "yarn --frozen-lockfile",
+        run: "yarn",
+        exec: "yarn",
+        dlx: "yarn dlx",
+        lockfile: "yarn.lock",
+        prismaExec: "yarn prisma",
+        runDev: "yarn dev",
+        audit: "yarn npm audit --environment production"
+      };
     case "bun":
-      return { name: "bun", install: "bun install", ci: "bun install --frozen-lockfile", run: "bun run", exec: "bunx", dlx: "bunx", lockfile: "bun.lockb", prismaExec: "bunx prisma", runDev: "bun run dev", audit: "bun audit --prod" };
+      return {
+        name: "bun",
+        install: "bun install",
+        ci: "bun install --frozen-lockfile",
+        run: "bun run",
+        exec: "bunx",
+        dlx: "bunx",
+        lockfile: "bun.lockb",
+        prismaExec: "bunx prisma",
+        runDev: "bun run dev",
+        audit: "bun audit --prod"
+      };
   }
 }
 function detectPackageManager(cwd) {
@@ -78,17 +130,13 @@ async function downloadRepo(localPath) {
   const dest = join(tmpdir(), `projx-${Date.now()}`);
   await mkdir(dest, { recursive: true });
   if (hasCommand("git")) {
-    execSync(
-      `git clone --depth 1 ${REPO_URL}.git "${dest}/repo"`,
-      { stdio: "pipe" }
-    );
+    execSync(`git clone --depth 1 ${REPO_URL}.git "${dest}/repo"`, {
+      stdio: "pipe"
+    });
     return join(dest, "repo");
   }
   const tarUrl = `${REPO_URL}/archive/refs/heads/main.tar.gz`;
-  execSync(
-    `curl -sL "${tarUrl}" | tar xz -C "${dest}"`,
-    { stdio: "pipe" }
-  );
+  execSync(`curl -sL "${tarUrl}" | tar xz -C "${dest}"`, { stdio: "pipe" });
   const entries = await readdir(dest);
   const extracted = entries.find((e) => e.startsWith("projx-"));
   if (!extracted) throw new Error("Failed to extract repo archive.");
@@ -165,10 +213,19 @@ async function copyStaticFiles(repoDir, dest) {
     await cp(extensionsJson, join(dest, ".vscode/extensions.json"));
     manifest.push(".vscode/extensions.json");
   }
-  const scripts = join(tpl, "scripts");
-  if (existsSync(scripts)) {
-    await cp(scripts, join(dest, "scripts"), { recursive: true });
-    manifest.push("scripts/setup-ssl.sh");
+  const staticScripts = ["setup-docker.sh", "setup-ssl.sh"];
+  const scriptsSrc = join(tpl, "scripts");
+  if (existsSync(scriptsSrc)) {
+    await mkdir(join(dest, "scripts"), { recursive: true });
+    for (const file of staticScripts) {
+      const src = join(scriptsSrc, file);
+      const dst = join(dest, "scripts", file);
+      if (existsSync(src) && !existsSync(dst)) {
+        await cp(src, dst);
+        await chmod(dst, 493);
+        manifest.push(`scripts/${file}`);
+      }
+    }
   }
   return manifest;
 }
@@ -273,7 +330,9 @@ var DEFAULT_ROOT_SKIP_PATTERNS = [
   "README.md",
   ".githooks/pre-commit",
   ".github/workflows/ci.yml",
-  "setup.sh"
+  "scripts/setup.sh",
+  "scripts/setup-docker.sh",
+  "scripts/setup-ssl.sh"
 ];
 var DEFAULT_COMPONENT_SKIP_PATTERNS = {
   fastapi: ["pyproject.toml"],
@@ -293,7 +352,9 @@ async function discoverComponentPaths(cwd, components) {
 async function discoverComponentsFromMarkers(cwd) {
   const components = [];
   const paths = {};
-  if (!existsSync(cwd)) return { components, paths };
+  const instances = [];
+  if (!existsSync(cwd))
+    return { components, paths, instances };
   const entries = await readdir(cwd, { withFileTypes: true });
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
@@ -301,6 +362,7 @@ async function discoverComponentsFromMarkers(cwd) {
     if (entry.name.startsWith(".")) continue;
     const marker = await readComponentMarker(join(cwd, entry.name));
     if (!marker) continue;
+    instances.push({ type: marker.component, path: entry.name });
     if (!components.includes(marker.component)) {
       components.push(marker.component);
       paths[marker.component] = entry.name;
@@ -309,33 +371,82 @@ async function discoverComponentsFromMarkers(cwd) {
   for (const c of components) {
     if (!paths[c]) paths[c] = c;
   }
-  return { components, paths };
+  return { components, paths, instances };
 }
 function render(template, vars) {
+  const lines = template.split("\n");
+  return renderLines(lines, vars).replace(/\n{3,}/g, "\n\n");
+}
+function evalExpr(expr, vars) {
   const components = vars.components;
   const projectName = vars.projectName;
-  const lines = template.split("\n");
+  const pmName = vars.pm?.name ?? "npm";
+  const argNames = ["components", "projectName", "pm"];
+  const argValues = [components, projectName, pmName];
+  for (const [k, v] of Object.entries(vars)) {
+    if (k === "components" || k === "projectName" || k === "pm") continue;
+    if (!/^[a-zA-Z_$][\w$]*$/.test(k)) continue;
+    argNames.push(k);
+    argValues.push(v);
+  }
+  const fn = new Function(...argNames, `return ${expr}`);
+  return fn(...argValues);
+}
+function findBlockEnd(lines, startIdx) {
+  let depth = 1;
+  for (let i = startIdx + 1; i < lines.length; i++) {
+    const line = lines[i];
+    if (/^<%\s*(if|for)\s*\(.+?\)\s*\{?\s*%>$/.test(line)) depth++;
+    else if (/^<%\s*\}\s*else\s+if\s*\((.+?)\)\s*\{?\s*%>$/.test(line)) {
+    } else if (/^<%\s*\}\s*else\s*\{?\s*%>$/.test(line)) {
+    } else if (/^<%\s*\}?\s*%>$/.test(line)) {
+      depth--;
+      if (depth === 0) return i;
+    }
+  }
+  throw new Error("Unmatched template block");
+}
+function renderLines(lines, vars) {
   const output = [];
   const stack = [];
-  for (const line of lines) {
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const forMatch = line.match(
+      /^<%\s*for\s*\(\s*(?:const|let)\s+(\w+)\s+of\s+(.+?)\s*\)\s*\{?\s*%>$/
+    );
+    if (forMatch) {
+      const varName = forMatch[1];
+      const iterExpr = forMatch[2];
+      const end = findBlockEnd(lines, i);
+      const bodyLines = lines.slice(i + 1, end);
+      if (stack.length === 0 || stack.every((v) => v.active)) {
+        const iterable = evalExpr(iterExpr, vars);
+        if (Array.isArray(iterable)) {
+          for (const item of iterable) {
+            const sub = renderLines(bodyLines, { ...vars, [varName]: item });
+            if (sub) output.push(sub);
+          }
+        }
+      }
+      i = end;
+      continue;
+    }
     const ifMatch = line.match(/^<%\s*if\s*\((.+?)\)\s*\{?\s*%>$/);
     if (ifMatch) {
-      const pmName = vars.pm?.name ?? "npm";
-      const fn = new Function("components", "projectName", "pm", `return ${ifMatch[1]}`);
-      const result = fn(components, projectName, pmName);
+      const result = Boolean(evalExpr(ifMatch[1], vars));
       stack.push({ active: result, matched: result });
       continue;
     }
-    const elseIfMatch = line.match(/^<%\s*\}\s*else\s+if\s*\((.+?)\)\s*\{?\s*%>$/);
+    const elseIfMatch = line.match(
+      /^<%\s*\}\s*else\s+if\s*\((.+?)\)\s*\{?\s*%>$/
+    );
     if (elseIfMatch) {
       if (stack.length > 0) {
         const top = stack[stack.length - 1];
         if (top.matched) {
           top.active = false;
         } else {
-          const pmN = vars.pm?.name ?? "npm";
-          const fn = new Function("components", "projectName", "pm", `return ${elseIfMatch[1]}`);
-          const result = fn(components, projectName, pmN);
+          const result = Boolean(evalExpr(elseIfMatch[1], vars));
           top.active = result;
           if (result) top.matched = true;
         }
@@ -354,20 +465,22 @@ function render(template, vars) {
       continue;
     }
     if (stack.length > 0 && stack.some((v) => !v.active)) continue;
-    const replaced = line.replace(
-      /<%=\s*([\w.]+)\s*%>/g,
-      (_, expr) => {
-        const parts = expr.split(".");
-        let val = vars;
+    const replaced = line.replace(/<%=\s*(.+?)\s*%>/g, (_, expr) => {
+      const trimmed = expr.trim();
+      if (/^[\w.]+$/.test(trimmed)) {
+        const parts = trimmed.split(".");
+        let val2 = vars;
         for (const p of parts) {
-          val = val?.[p];
+          val2 = val2?.[p];
         }
-        return String(val ?? "");
+        return String(val2 ?? "");
       }
-    );
+      const val = evalExpr(trimmed, vars);
+      return String(val ?? "");
+    });
     output.push(replaced);
   }
-  return output.join("\n").replace(/\n{3,}/g, "\n\n");
+  return output.join("\n");
 }
 async function renderEjsInDir(dir, vars) {
   if (!existsSync(dir)) return;