create-projx 1.7.0 → 1.7.1

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   matchesSkip,
   saveBaselineRef,
   writeTemplateToDir
-} from "./chunk-IMZKHDIL.js";
+} from "./chunk-N4WD4VN3.js";
 import {
   COMPONENTS,
   COMPONENT_MARKER,
@@ -36,10 +36,10 @@ import {
   toSnake,
   writeComponentMarker,
   writeProjxConfig
-} from "./chunk-HAT7D4G2.js";
+} from "./chunk-OLPF7FAN.js";
 
 // src/index.ts
-import { existsSync as existsSync12 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import { resolve } from "path";
 
 // src/features.ts
@@ -58,8 +58,8 @@ function parseFeatureFlag(input) {
         `Invalid feature flag: empty target in "${input}". Use "component[:instance],..." form.`
       );
     }
-    const parts = piece.split(":").map((p11) => p11.trim());
-    if (parts.length > 2 || parts.some((p11) => !p11)) {
+    const parts = piece.split(":").map((p10) => p10.trim());
+    if (parts.length > 2 || parts.some((p10) => !p10)) {
       throw new Error(
         `Invalid feature flag target "${piece}". Expected "component" or "component:instance".`
       );
@@ -195,13 +195,45 @@ async function applyTarget(args2) {
       `Target instance path ${args2.target.path} not found in ${args2.dest}.`
     );
   }
-  const filesDir = join(stackDir, "files");
-  if (existsSync(filesDir)) {
-    await renderFilesInto(filesDir, targetPath, args2.vars);
+  const orm = typeof args2.vars.orm === "string" ? args2.vars.orm : void 0;
+  const ormDir = orm ? join(stackDir, orm) : void 0;
+  const hasOrmDir = ormDir !== void 0 && existsSync(ormDir);
+  const ormPatchNames = /* @__PURE__ */ new Set();
+  if (hasOrmDir) {
+    const ormPatchesDir = join(ormDir, "patches");
+    if (existsSync(ormPatchesDir)) {
+      for (const f of await readdir(ormPatchesDir)) {
+        if (f.endsWith(".json")) ormPatchNames.add(f);
+      }
+    }
+  }
+  for (const sub of ["files", join("common", "files")]) {
+    const filesDir = join(stackDir, sub);
+    if (existsSync(filesDir)) {
+      await renderFilesInto(filesDir, targetPath, args2.vars);
+    }
+  }
+  for (const sub of ["patches", join("common", "patches")]) {
+    const patchesDir = join(stackDir, sub);
+    if (existsSync(patchesDir)) {
+      await applyPatches(
+        patchesDir,
+        targetPath,
+        args2.featureName,
+        ormPatchNames,
+        hasOrmDir
+      );
+    }
   }
-  const patchesDir = join(stackDir, "patches");
-  if (existsSync(patchesDir)) {
-    await applyPatches(patchesDir, targetPath, args2.featureName);
+  if (hasOrmDir) {
+    const ormFilesDir = join(ormDir, "files");
+    if (existsSync(ormFilesDir)) {
+      await renderFilesInto(ormFilesDir, targetPath, args2.vars);
+    }
+    const ormPatchesDir = join(ormDir, "patches");
+    if (existsSync(ormPatchesDir)) {
+      await applyPatches(ormPatchesDir, targetPath, args2.featureName);
+    }
   }
   const envKeys = args2.manifest.env?.[args2.target.component] ?? [];
   if (envKeys.length > 0) {
@@ -238,15 +270,20 @@ async function collectFiles(root) {
   await walk(root);
   return out.sort();
 }
-async function applyPatches(patchesDir, targetPath, featureName) {
-  const files = (await readdir(patchesDir)).filter((f) => f.endsWith(".json")).sort();
+async function applyPatches(patchesDir, targetPath, featureName, skipNames = /* @__PURE__ */ new Set(), tolerateMissingTarget = false) {
+  const files = (await readdir(patchesDir)).filter((f) => f.endsWith(".json")).filter((f) => !skipNames.has(f)).sort();
   for (const file of files) {
     const raw = await readFile(join(patchesDir, file), "utf-8");
     const patch = JSON.parse(raw);
     if (patch.type === "package-json") {
       await applyPackageJsonPatch(targetPath, patch);
     } else if (patch.type === "text") {
-      await applyTextPatch(targetPath, patch, featureName);
+      await applyTextPatch(
+        targetPath,
+        patch,
+        featureName,
+        tolerateMissingTarget
+      );
     } else {
       throw new Error(
         `Unknown patch type in ${file}: ${patch.type}.`
@@ -268,22 +305,25 @@ async function applyPackageJsonPatch(targetPath, patch) {
   }
   await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
 }
-async function applyTextPatch(targetPath, patch, featureName) {
+async function applyTextPatch(targetPath, patch, featureName, tolerateMissingTarget = false) {
   const filePath = join(targetPath, patch.file);
   if (!existsSync(filePath)) {
+    if (tolerateMissingTarget) return;
     throw new Error(
       `text patch failed: ${patch.file} not found in ${targetPath}.`
     );
   }
   const content = await readFile(filePath, "utf-8");
-  const sentinel = sentinelFor(featureName, patch.anchor, patch.insert);
-  if (content.includes(sentinel)) return;
   const idx = content.indexOf(patch.anchor);
   if (idx === -1) {
     throw new Error(
       `text patch anchor "${patch.anchor}" not found in ${patch.file}.`
     );
   }
+  const lineStart = content.lastIndexOf("\n", idx) + 1;
+  const indent = content.slice(lineStart, idx).match(/^\s*/)?.[0] ?? "";
+  const sentinel = sentinelFor(featureName, patch.anchor, patch.insert, indent);
+  if (content.includes(sentinel)) return;
   const insertWithSentinel = patch.insert + sentinel;
   let next;
   if (patch.position === "before") {
@@ -296,11 +336,11 @@ async function applyTextPatch(targetPath, patch, featureName) {
   }
   await writeFile(filePath, next);
 }
-function sentinelFor(feature, anchor, insert) {
+function sentinelFor(feature, anchor, insert, indent = "") {
   const hash = simpleHash(anchor + "|" + insert);
   const isHash = anchor.includes("#");
   const open = isHash ? "# " : "// ";
-  return `${open}projx-feature: ${feature} ${hash}
+  return `${indent}${open}projx-feature: ${feature} ${hash}
 `;
 }
 function simpleHash(s) {
@@ -442,8 +482,8 @@ async function scaffold(opts, dest, localRepo) {
     if (opts.git) {
       exec("git init", dest);
     }
-    const spinner7 = p2.spinner();
-    spinner7.start("Scaffolding project");
+    const spinner6 = p2.spinner();
+    spinner6.start("Scaffolding project");
     await applyTemplate(
       dest,
       repoDir,
@@ -455,7 +495,7 @@ async function scaffold(opts, dest, localRepo) {
       void 0,
       true
     );
-    spinner7.stop("Scaffold complete.");
+    spinner6.stop("Scaffold complete.");
     if (opts.features && Object.keys(opts.features).length > 0) {
       const featSpinner = p2.spinner();
       featSpinner.start("Applying features");
@@ -498,23 +538,23 @@ async function installDeps(dest, components, pm) {
   const cmds = pmCommands(pm);
   const pmBin = pm === "bun" ? "bun" : pm;
   for (const component of components) {
-    const spinner7 = p2.spinner();
+    const spinner6 = p2.spinner();
     try {
       switch (component) {
         case "fastapi":
           if (hasCommand("uv")) {
-            spinner7.start("Installing FastAPI dependencies (uv sync)");
+            spinner6.start("Installing FastAPI dependencies (uv sync)");
             exec("uv sync --all-extras", join2(dest, "fastapi"));
-            spinner7.stop("FastAPI dependencies installed.");
+            spinner6.stop("FastAPI dependencies installed.");
           } else {
             p2.log.warn("uv not found \u2014 run 'cd fastapi && uv sync' manually.");
           }
           break;
         case "fastify":
           if (hasCommand(pmBin)) {
-            spinner7.start(`Installing Fastify dependencies (${cmds.install})`);
+            spinner6.start(`Installing Fastify dependencies (${cmds.install})`);
             exec(cmds.install, join2(dest, "fastify"));
-            spinner7.stop("Fastify dependencies installed.");
+            spinner6.stop("Fastify dependencies installed.");
           } else {
             p2.log.warn(
               `${pm} not found \u2014 run 'cd fastify && ${cmds.install}' manually.`
@@ -523,9 +563,9 @@ async function installDeps(dest, components, pm) {
           break;
         case "express":
           if (hasCommand(pmBin)) {
-            spinner7.start(`Installing Express dependencies (${cmds.install})`);
+            spinner6.start(`Installing Express dependencies (${cmds.install})`);
             exec(cmds.install, join2(dest, "express"));
-            spinner7.stop("Express dependencies installed.");
+            spinner6.stop("Express dependencies installed.");
           } else {
             p2.log.warn(
               `${pm} not found \u2014 run 'cd express && ${cmds.install}' manually.`
@@ -534,9 +574,9 @@ async function installDeps(dest, components, pm) {
           break;
         case "frontend":
           if (hasCommand(pmBin)) {
-            spinner7.start(`Installing Frontend dependencies (${cmds.install})`);
+            spinner6.start(`Installing Frontend dependencies (${cmds.install})`);
             exec(cmds.install, join2(dest, "frontend"));
-            spinner7.stop("Frontend dependencies installed.");
+            spinner6.stop("Frontend dependencies installed.");
           } else {
             p2.log.warn(
               `${pm} not found \u2014 run 'cd frontend && ${cmds.install}' manually.`
@@ -545,9 +585,9 @@ async function installDeps(dest, components, pm) {
           break;
         case "e2e":
           if (hasCommand(pmBin)) {
-            spinner7.start(`Installing E2E dependencies (${cmds.install})`);
+            spinner6.start(`Installing E2E dependencies (${cmds.install})`);
             exec(cmds.install, join2(dest, "e2e"));
-            spinner7.stop("E2E dependencies installed.");
+            spinner6.stop("E2E dependencies installed.");
           } else {
             p2.log.warn(
               `${pm} not found \u2014 run 'cd e2e && ${cmds.install}' manually.`
@@ -556,9 +596,9 @@ async function installDeps(dest, components, pm) {
           break;
         case "mobile":
           if (hasCommand("flutter")) {
-            spinner7.start("Installing Flutter dependencies");
+            spinner6.start("Installing Flutter dependencies");
             exec("flutter pub get", join2(dest, "mobile"));
-            spinner7.stop("Flutter dependencies installed.");
+            spinner6.stop("Flutter dependencies installed.");
           } else {
             p2.log.warn(
               "Flutter not found \u2014 run 'cd mobile && flutter pub get' manually."
@@ -569,7 +609,7 @@ async function installDeps(dest, components, pm) {
           break;
       }
     } catch {
-      spinner7.stop(`Failed to install ${component} dependencies.`);
+      spinner6.stop(`Failed to install ${component} dependencies.`);
     }
   }
 }
@@ -704,8 +744,8 @@ async function update(cwd, localRepo) {
       nameOverrides,
       orm: raw.orm ?? "prisma"
     };
-    const spinner7 = p3.spinner();
-    spinner7.start("Applying template update");
+    const spinner6 = p3.spinner();
+    spinner6.start("Applying template update");
     const rootSkip = Array.isArray(raw.skip) ? raw.skip : [];
     const isLegacyMigration = !raw.defaultsApplied;
     if (isLegacyMigration) {
@@ -725,7 +765,7 @@ async function update(cwd, localRepo) {
       isLegacyMigration,
       extraInstances
     );
-    spinner7.stop("Template applied.");
+    spinner6.stop("Template applied.");
     const pinnedUpdates = await findPinnedFilesWithUpdates(
       cwd,
       repoDir,
@@ -811,7 +851,7 @@ function hasUncommittedChanges(cwd) {
 async function findPinnedFilesWithUpdates(cwd, repoDir, components, componentPaths, vars, version, componentSkips, rootSkip) {
   const { mkdtemp: mkdtemp2, rm: rm2, readFile: readFile8 } = await import("fs/promises");
   const { tmpdir: tmpdir2 } = await import("os");
-  const { writeTemplateToDir: writeTemplateToDir2 } = await import("./baseline-FHOZNS4D.js");
+  const { writeTemplateToDir: writeTemplateToDir2 } = await import("./baseline-FKCXQFRD.js");
   const config = await readProjxConfig(cwd);
   const rootPinned = Array.isArray(config.skip) ? config.skip : [];
   const componentPinned = [];
@@ -1072,8 +1112,8 @@ async function add(cwd, newComponents, localRepo, skipInstall = false, customNam
       await readFile4(join4(repoDir, "cli/package.json"), "utf-8")
     );
     const version = pkg.version;
-    const spinner7 = p4.spinner();
-    spinner7.start("Adding components");
+    const spinner6 = p4.spinner();
+    spinner6.start("Adding components");
     await writeTemplateToDir(
       cwd,
       repoDir,
@@ -1083,7 +1123,7 @@ async function add(cwd, newComponents, localRepo, skipInstall = false, customNam
       version,
       { realCwd: cwd }
     );
-    spinner7.stop("Components added.");
+    spinner6.stop("Components added.");
     if (!skipInstall) {
       await installDeps2(
         cwd,
@@ -1148,14 +1188,14 @@ async function addInstance(cwd, type, customName, config, existing, localRepo, s
       "docker-compose.yml"
     ]);
     const rawSkip = Array.isArray(config.skip) ? config.skip : [];
-    const rootSkip = rawSkip.filter((p11) => !INSTANCE_AWARE_ROOT.has(p11));
+    const rootSkip = rawSkip.filter((p10) => !INSTANCE_AWARE_ROOT.has(p10));
     const componentSkips = {};
     for (const inst of existingInstances) {
       const m = await readComponentMarker(join4(cwd, inst.path));
       if (m?.skip && m.skip.length > 0) componentSkips[inst.type] = m.skip;
     }
-    const spinner7 = p4.spinner();
-    spinner7.start(`Scaffolding ${customName}/`);
+    const spinner6 = p4.spinner();
+    spinner6.start(`Scaffolding ${customName}/`);
     const result = await applyTemplate(
       cwd,
       repoDir,
@@ -1169,7 +1209,7 @@ async function addInstance(cwd, type, customName, config, existing, localRepo, s
       [newInstance],
       [newInstance]
     );
-    spinner7.stop(`Scaffolded ${customName}/.`);
+    spinner6.stop(`Scaffolded ${customName}/.`);
     if (result.status === "merged") {
       p4.log.success(
         `${result.mergedFiles?.length ?? 0} root file(s) merged cleanly.`
@@ -1205,25 +1245,25 @@ async function installDeps2(dest, instances, pm) {
   const pmBin = pm === "bun" ? "bun" : pm;
   for (const { type, path } of instances) {
     const dir = join4(dest, path);
-    const spinner7 = p4.spinner();
+    const spinner6 = p4.spinner();
     try {
       switch (type) {
         case "fastapi":
           if (hasCommand("uv")) {
-            spinner7.start(`Installing FastAPI dependencies (${path}/)`);
+            spinner6.start(`Installing FastAPI dependencies (${path}/)`);
             exec("uv sync --all-extras", dir);
-            spinner7.stop(`FastAPI dependencies installed (${path}/).`);
+            spinner6.stop(`FastAPI dependencies installed (${path}/).`);
           } else {
             p4.log.warn(`uv not found \u2014 run 'cd ${path} && uv sync' manually.`);
           }
           break;
         case "fastify":
           if (hasCommand(pmBin)) {
-            spinner7.start(
+            spinner6.start(
               `Installing Fastify dependencies (${path}/, ${cmds.install})`
             );
             exec(cmds.install, dir);
-            spinner7.stop(`Fastify dependencies installed (${path}/).`);
+            spinner6.stop(`Fastify dependencies installed (${path}/).`);
           } else {
             p4.log.warn(
               `${pm} not found \u2014 run 'cd ${path} && ${cmds.install}' manually.`
@@ -1232,11 +1272,11 @@ async function installDeps2(dest, instances, pm) {
           break;
         case "express":
           if (hasCommand(pmBin)) {
-            spinner7.start(
+            spinner6.start(
               `Installing Express dependencies (${path}/, ${cmds.install})`
             );
             exec(cmds.install, dir);
-            spinner7.stop(`Express dependencies installed (${path}/).`);
+            spinner6.stop(`Express dependencies installed (${path}/).`);
           } else {
             p4.log.warn(
               `${pm} not found \u2014 run 'cd ${path} && ${cmds.install}' manually.`
@@ -1245,11 +1285,11 @@ async function installDeps2(dest, instances, pm) {
           break;
         case "frontend":
           if (hasCommand(pmBin)) {
-            spinner7.start(
+            spinner6.start(
               `Installing Frontend dependencies (${path}/, ${cmds.install})`
             );
             exec(cmds.install, dir);
-            spinner7.stop(`Frontend dependencies installed (${path}/).`);
+            spinner6.stop(`Frontend dependencies installed (${path}/).`);
           } else {
             p4.log.warn(
               `${pm} not found \u2014 run 'cd ${path} && ${cmds.install}' manually.`
@@ -1258,11 +1298,11 @@ async function installDeps2(dest, instances, pm) {
           break;
         case "e2e":
           if (hasCommand(pmBin)) {
-            spinner7.start(
+            spinner6.start(
               `Installing E2E dependencies (${path}/, ${cmds.install})`
             );
             exec(cmds.install, dir);
-            spinner7.stop(`E2E dependencies installed (${path}/).`);
+            spinner6.stop(`E2E dependencies installed (${path}/).`);
           } else {
             p4.log.warn(
               `${pm} not found \u2014 run 'cd ${path} && ${cmds.install}' manually.`
@@ -1271,9 +1311,9 @@ async function installDeps2(dest, instances, pm) {
           break;
         case "mobile":
           if (hasCommand("flutter")) {
-            spinner7.start(`Installing Flutter dependencies (${path}/)`);
+            spinner6.start(`Installing Flutter dependencies (${path}/)`);
             exec("flutter pub get", dir);
-            spinner7.stop(`Flutter dependencies installed (${path}/).`);
+            spinner6.stop(`Flutter dependencies installed (${path}/).`);
           } else {
             p4.log.warn(
               `Flutter not found \u2014 run 'cd ${path} && flutter pub get' manually.`
@@ -1284,7 +1324,7 @@ async function installDeps2(dest, instances, pm) {
           break;
       }
     } catch {
-      spinner7.stop(`Failed to install ${type} dependencies (${path}/).`);
+      spinner6.stop(`Failed to install ${type} dependencies (${path}/).`);
     }
   }
 }
@@ -1410,10 +1450,10 @@ async function init(cwd, localRepo) {
     p5.log.error("You have uncommitted changes. Commit or stash them first.");
     process.exit(1);
   }
-  const spinner7 = p5.spinner();
-  spinner7.start("Scanning for components");
+  const spinner6 = p5.spinner();
+  spinner6.start("Scanning for components");
   const detected = await detectComponents(cwd);
-  spinner7.stop(
+  spinner6.stop(
     detected.length > 0 ? `Found ${detected.length} component(s).` : "No components detected."
   );
   if (detected.length === 0) {
@@ -2097,8 +2137,8 @@ async function diff(cwd, localRepo) {
       pm: pmCommands(raw.packageManager ?? "npm"),
       orm: raw.orm ?? "prisma"
     };
-    const spinner7 = p8.spinner();
-    spinner7.start("Analyzing changes");
+    const spinner6 = p8.spinner();
+    spinner6.start("Analyzing changes");
     const tmpTemplate = await mkdtemp(join9(tmpdir(), "projx-diff-"));
     await writeTemplateToDir(
       tmpTemplate,
@@ -2157,7 +2197,7 @@ async function diff(cwd, localRepo) {
       }
     }
     await rm(tmpTemplate, { recursive: true, force: true });
-    spinner7.stop("Analysis complete.");
+    spinner6.stop("Analysis complete.");
     const groups = {
       new: [],
       "clean-update": [],
@@ -2214,7 +2254,6 @@ async function diff(cwd, localRepo) {
 import { existsSync as existsSync10 } from "fs";
 import { readFile as readFile7, writeFile as writeFile2, mkdir as mkdir3 } from "fs/promises";
 import { join as join10 } from "path";
-import { fileURLToPath } from "url";
 import * as p9 from "@clack/prompts";
 var FIELD_TYPES = [
   "string",
@@ -3206,9 +3245,8 @@ function generateExpressTest(config) {
   lines.push("");
   return lines.join("\n");
 }
-function addonGenEntityPath(orm, fileName) {
-  const thisFile = fileURLToPath(import.meta.url);
-  return join10(thisFile, "../../src/addons/orms", orm, "gen-entity", fileName);
+function addonGenEntityPath(repoDir, orm, fileName) {
+  return join10(repoDir, "addons", "orms", orm, "gen-entity", fileName);
 }
 function sampleValue(field) {
   switch (field.type) {
@@ -3251,8 +3289,8 @@ function insertAtAnchor(content, anchor, insertion) {
   }
   return content;
 }
-async function fillTemplate(orm, fileName, vars) {
-  const path = addonGenEntityPath(orm, fileName);
+async function fillTemplate(repoDir, orm, fileName, vars) {
+  const path = addonGenEntityPath(repoDir, orm, fileName);
   if (!existsSync10(path)) {
     throw new Error(`Addon template not found: ${path}`);
   }
@@ -3393,14 +3431,19 @@ function buildTypeormEntityVars(config) {
     COLUMN_DECORATORS: typeormColumnDecorators(config.fields)
   };
 }
-async function appendTypeormEntity(cwd, dir, framework, config, generated) {
+async function appendTypeormEntity(repoDir, cwd, dir, framework, config, generated) {
   const vars = buildTypeormEntityVars(config);
   const kebab = vars.ENTITY_KEBAB;
   const entitiesDir = join10(cwd, dir, "src/entities");
   await mkdir3(entitiesDir, { recursive: true });
   const entityPath = join10(entitiesDir, `${kebab}.ts`);
   if (!existsSync10(entityPath)) {
-    const entitySource = await fillTemplate("typeorm", "entity.ts", vars);
+    const entitySource = await fillTemplate(
+      repoDir,
+      "typeorm",
+      "entity.ts",
+      vars
+    );
     await writeFile2(entityPath, entitySource);
     generated.push(`${dir}/src/entities/${kebab}.ts`);
   }
@@ -3424,6 +3467,7 @@ async function appendTypeormEntity(cwd, dir, framework, config, generated) {
   if (!existsSync10(moduleDir)) {
     await mkdir3(moduleDir, { recursive: true });
     const routerSource = await fillTemplate(
+      repoDir,
       "typeorm",
       framework === "fastify" ? "fastify-router.ts" : "express-router.ts",
       vars
@@ -3452,6 +3496,7 @@ async function appendTypeormEntity(cwd, dir, framework, config, generated) {
   const testFile = join10(testsDir, `${kebab}.test.ts`);
   if (!existsSync10(testFile)) {
     const testSource = await fillTemplate(
+      repoDir,
       "typeorm",
       framework === "fastify" ? "fastify-test.ts" : "express-test.ts",
       vars
@@ -3461,14 +3506,19 @@ async function appendTypeormEntity(cwd, dir, framework, config, generated) {
     generated.push(`${dir}/${testRel}`);
   }
 }
-async function appendSequelizeEntity(cwd, dir, framework, config, generated) {
+async function appendSequelizeEntity(repoDir, cwd, dir, framework, config, generated) {
   const vars = buildSequelizeEntityVars(config);
   const kebab = vars.ENTITY_KEBAB;
   const modelsDir = join10(cwd, dir, "src/models");
   await mkdir3(modelsDir, { recursive: true });
   const modelPath = join10(modelsDir, `${kebab}.ts`);
   if (!existsSync10(modelPath)) {
-    const modelSource = await fillTemplate("sequelize", "model.ts", vars);
+    const modelSource = await fillTemplate(
+      repoDir,
+      "sequelize",
+      "model.ts",
+      vars
+    );
     await writeFile2(modelPath, modelSource);
     generated.push(`${dir}/src/models/${kebab}.ts`);
   }
@@ -3492,6 +3542,7 @@ async function appendSequelizeEntity(cwd, dir, framework, config, generated) {
   if (!existsSync10(moduleDir)) {
     await mkdir3(moduleDir, { recursive: true });
     const routerSource = await fillTemplate(
+      repoDir,
       "sequelize",
       framework === "fastify" ? "fastify-router.ts" : "express-router.ts",
       vars
@@ -3520,6 +3571,7 @@ async function appendSequelizeEntity(cwd, dir, framework, config, generated) {
   const testFile = join10(testsDir, `${kebab}.test.ts`);
   if (!existsSync10(testFile)) {
     const testSource = await fillTemplate(
+      repoDir,
       "sequelize",
       framework === "fastify" ? "fastify-test.ts" : "express-test.ts",
       vars
@@ -3529,7 +3581,7 @@ async function appendSequelizeEntity(cwd, dir, framework, config, generated) {
     generated.push(`${dir}/${testRel}`);
   }
 }
-async function appendDrizzleEntity(cwd, dir, framework, config, generated) {
+async function appendDrizzleEntity(repoDir, cwd, dir, framework, config, generated) {
   const schemaDir = join10(cwd, dir, "src/db");
   const schemaPath = join10(schemaDir, "schema.ts");
   const tableConst = toCamel(pluralize(toPascal(config.name)));
@@ -3579,6 +3631,7 @@ ${tableSource}
   if (!existsSync10(moduleDir)) {
     await mkdir3(moduleDir, { recursive: true });
     const routerSource = await fillTemplate(
+      repoDir,
       "drizzle",
       framework === "fastify" ? "fastify-router.ts" : "express-router.ts",
       vars
@@ -3607,6 +3660,7 @@ ${tableSource}
   const testFile = join10(testsDir, `${kebab}.test.ts`);
   if (!existsSync10(testFile)) {
     const testSource = await fillTemplate(
+      repoDir,
       "drizzle",
       framework === "fastify" ? "fastify-test.ts" : "express-test.ts",
       vars
@@ -3645,7 +3699,7 @@ async function resolvePrimaryBackend(cwd, hasFastapi, hasFastify, hasExpress, ba
   p9.log.success(`Saved primaryBackend: ${choice} to .projx`);
   return choice;
 }
-async function gen(cwd, entityName, fieldsFlag, backendFlag) {
+async function gen(cwd, entityName, fieldsFlag, backendFlag, localRepo) {
   p9.intro(`projx gen entity ${entityName}`);
   if (!existsSync10(join10(cwd, ".projx"))) {
     p9.log.error("No .projx file found. Run 'npx create-projx init' first.");
@@ -3655,6 +3709,30 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
   const pmName = projxData.packageManager ?? "npm";
   const pm = pmCommands(pmName);
   const orm = projxData.orm ?? "prisma";
+  const needsAddon = orm === "drizzle" || orm === "sequelize" || orm === "typeorm";
+  const repoDir = needsAddon ? await downloadRepo(localRepo).catch((err) => {
+    p9.cancel(`Failed to fetch templates: ${err.message}`);
+    process.exit(1);
+  }) : "";
+  const isLocal = Boolean(localRepo);
+  try {
+    return await runGen({
+      cwd,
+      entityName,
+      fieldsFlag,
+      backendFlag,
+      pm,
+      orm,
+      repoDir
+    });
+  } finally {
+    if (needsAddon && repoDir) {
+      await cleanupRepo(repoDir, isLocal);
+    }
+  }
+}
+async function runGen(opts) {
+  const { cwd, entityName, fieldsFlag, backendFlag, pm, orm, repoDir } = opts;
   const { components: discovered, paths: componentPaths } = await discoverComponentsFromMarkers(cwd);
   const hasFastapi = discovered.includes("fastapi");
   const hasFastify = discovered.includes("fastify");
@@ -3788,6 +3866,7 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
   }
   if (genFastify && orm === "drizzle") {
     await appendDrizzleEntity(
+      repoDir,
       cwd,
       componentPaths.fastify,
       "fastify",
@@ -3796,6 +3875,7 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     );
   } else if (genFastify && orm === "sequelize") {
     await appendSequelizeEntity(
+      repoDir,
       cwd,
       componentPaths.fastify,
       "fastify",
@@ -3804,6 +3884,7 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     );
   } else if (genFastify && orm === "typeorm") {
     await appendTypeormEntity(
+      repoDir,
       cwd,
       componentPaths.fastify,
       "fastify",
@@ -3872,6 +3953,7 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
   }
   if (genExpress && orm === "drizzle") {
     await appendDrizzleEntity(
+      repoDir,
       cwd,
       componentPaths.express,
       "express",
@@ -3880,6 +3962,7 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     );
   } else if (genExpress && orm === "sequelize") {
     await appendSequelizeEntity(
+      repoDir,
       cwd,
       componentPaths.express,
       "express",
@@ -3888,6 +3971,7 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     );
   } else if (genExpress && orm === "typeorm") {
     await appendTypeormEntity(
+      repoDir,
       cwd,
       componentPaths.express,
       "express",
@@ -4001,293 +4085,6 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
   p9.outro(`Entity ${className} created.`);
 }
 
-// src/sync.ts
-import { existsSync as existsSync11, readFileSync } from "fs";
-import { writeFile as writeFile3, mkdir as mkdir4 } from "fs/promises";
-import { join as join11 } from "path";
-import * as p10 from "@clack/prompts";
-function toPascal2(s) {
-  return s.replace(/(?:^|[_\-\s])([a-zA-Z])/g, (_, c) => c.toUpperCase());
-}
-function toCamel2(s) {
-  return s.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
-}
-function metaTypeToTs(type, fieldType, nullable) {
-  const base = (() => {
-    switch (type) {
-      case "str":
-        return "string";
-      case "int":
-      case "float":
-        return "number";
-      case "bool":
-        return "boolean";
-      case "datetime":
-      case "date":
-        return "string";
-      case "dict":
-        return "Record<string, unknown>";
-      default:
-        return "unknown";
-    }
-  })();
-  return nullable ? `${base} | null` : base;
-}
-function metaTypeToDart(type, nullable) {
-  const base = (() => {
-    switch (type) {
-      case "str":
-        return "String";
-      case "int":
-        return "int";
-      case "float":
-        return "double";
-      case "bool":
-        return "bool";
-      case "datetime":
-      case "date":
-        return "DateTime";
-      case "dict":
-        return "Map<String, dynamic>";
-      default:
-        return "dynamic";
-    }
-  })();
-  return nullable ? `${base}?` : base;
-}
-function dartFromJsonExpr(key, type, nullable) {
-  const accessor = `json['${key}']`;
-  const isDate = type === "datetime" || type === "date";
-  if (isDate && nullable)
-    return `${accessor} != null ? DateTime.parse(${accessor} as String) : null`;
-  if (isDate) return `DateTime.parse(${accessor} as String)`;
-  if (type === "dict" && nullable)
-    return `${accessor} as Map<String, dynamic>?`;
-  if (type === "dict") return `${accessor} as Map<String, dynamic>`;
-  const dartT = (() => {
-    switch (type) {
-      case "str":
-        return "String";
-      case "int":
-        return "int";
-      case "float":
-        return "double";
-      case "bool":
-        return "bool";
-      default:
-        return "dynamic";
-    }
-  })();
-  return nullable ? `${accessor} as ${dartT}?` : `${accessor} as ${dartT}`;
-}
-function dartToJsonExpr(key, camel, type) {
-  const isDate = type === "datetime" || type === "date";
-  if (isDate) return `'${key}': ${camel}?.toIso8601String()`;
-  return `'${key}': ${camel}`;
-}
-function generateTsInterface(entity) {
-  const className = toPascal2(entity.name);
-  const lines = [];
-  lines.push(`export interface ${className} {`);
-  for (const f of entity.fields) {
-    lines.push(
-      `  ${f.key}: ${metaTypeToTs(f.type, f.field_type, f.nullable)};`
-    );
-  }
-  lines.push(`}`);
-  lines.push("");
-  const createFields = entity.fields.filter((f) => f.in_create);
-  lines.push(`export interface Create${className} {`);
-  for (const f of createFields) {
-    const optional = f.nullable ? "?" : "";
-    lines.push(
-      `  ${f.key}${optional}: ${metaTypeToTs(f.type, f.field_type, f.nullable)};`
-    );
-  }
-  lines.push(`}`);
-  lines.push("");
-  const updateFields = entity.fields.filter((f) => f.in_update);
-  lines.push(`export interface Update${className} {`);
-  for (const f of updateFields) {
-    lines.push(`  ${f.key}?: ${metaTypeToTs(f.type, f.field_type, true)};`);
-  }
-  lines.push(`}`);
-  lines.push("");
-  return lines.join("\n");
-}
-function generateDartModel2(entity) {
-  const className = toPascal2(entity.name);
-  const lines = [];
-  const fields = entity.fields.map((f) => ({
-    snake: f.key,
-    camel: toCamel2(f.key),
-    type: metaTypeToDart(f.type, f.nullable),
-    nullable: f.nullable,
-    metaType: f.type
-  }));
-  lines.push(`class ${className} {`);
-  for (const f of fields) {
-    lines.push(`  final ${f.type} ${f.camel};`);
-  }
-  lines.push("");
-  lines.push(`  const ${className}({`);
-  for (const f of fields) {
-    if (f.nullable) {
-      lines.push(`    this.${f.camel},`);
-    } else {
-      lines.push(`    required this.${f.camel},`);
-    }
-  }
-  lines.push(`  });`);
-  lines.push("");
-  lines.push(`  factory ${className}.fromJson(Map<String, dynamic> json) {`);
-  lines.push(`    return ${className}(`);
-  for (const f of fields) {
-    lines.push(
-      `      ${f.camel}: ${dartFromJsonExpr(f.snake, f.metaType, f.nullable)},`
-    );
-  }
-  lines.push(`    );`);
-  lines.push(`  }`);
-  lines.push("");
-  lines.push(`  Map<String, dynamic> toJson() {`);
-  lines.push(`    return {`);
-  for (const f of fields) {
-    lines.push(`      ${dartToJsonExpr(f.snake, f.camel, f.metaType)},`);
-  }
-  lines.push(`    };`);
-  lines.push(`  }`);
-  lines.push("");
-  lines.push(`  ${className} copyWith({`);
-  for (const f of fields) {
-    lines.push(`    ${f.type.replace("?", "")}? ${f.camel},`);
-  }
-  lines.push(`  }) {`);
-  lines.push(`    return ${className}(`);
-  for (const f of fields) {
-    lines.push(`      ${f.camel}: ${f.camel} ?? this.${f.camel},`);
-  }
-  lines.push(`    );`);
-  lines.push(`  }`);
-  lines.push(`}`);
-  lines.push("");
-  return lines.join("\n");
-}
-async function sync(cwd, url) {
-  p10.intro("projx sync");
-  const configPath = join11(cwd, ".projx");
-  if (!existsSync11(configPath)) {
-    p10.log.error("No .projx file found. Run 'npx create-projx init' first.");
-    process.exit(1);
-  }
-  const { components: discovered, paths: componentPaths } = await discoverComponentsFromMarkers(cwd);
-  const hasFrontend = discovered.includes("frontend");
-  const hasMobile = discovered.includes("mobile");
-  if (!hasFrontend && !hasMobile) {
-    p10.log.error("No frontend or mobile component found. Nothing to sync.");
-    process.exit(1);
-  }
-  const metaUrl = url || detectMetaUrl(cwd);
-  const spinner7 = p10.spinner();
-  spinner7.start(`Fetching metadata from ${metaUrl}`);
-  let meta;
-  try {
-    const res = await fetch(metaUrl);
-    if (!res.ok) throw new Error(`HTTP ${res.status}`);
-    meta = await res.json();
-  } catch (err) {
-    spinner7.stop("Failed.");
-    p10.log.error(`Could not fetch ${metaUrl}: ${err}`);
-    p10.log.info("Make sure your backend is running.");
-    p10.log.info(
-      "Or specify URL: projx sync --url http://localhost:8000/api/v1/_meta"
-    );
-    process.exit(1);
-  }
-  spinner7.stop(`Fetched ${meta.entities.length} entity(s).`);
-  const generated = [];
-  if (hasFrontend) {
-    const dir = componentPaths.frontend;
-    const typesDir = join11(cwd, dir, "src/types");
-    await mkdir4(typesDir, { recursive: true });
-    const barrelExports = [];
-    for (const entity of meta.entities) {
-      const fileName = toKebab(toSnake(entity.name)) + ".ts";
-      const filePath = join11(typesDir, fileName);
-      await writeFile3(filePath, generateTsInterface(entity));
-      generated.push(`${dir}/src/types/${fileName}`);
-      barrelExports.push(`export * from './${toKebab(toSnake(entity.name))}';`);
-    }
-    await writeFile3(
-      join11(typesDir, "index.ts"),
-      barrelExports.join("\n") + "\n"
-    );
-    generated.push(`${dir}/src/types/index.ts`);
-  }
-  if (hasMobile) {
-    const dir = componentPaths.mobile;
-    for (const entity of meta.entities) {
-      const entityDir = join11(cwd, dir, "lib/entities", toSnake(entity.name));
-      await mkdir4(entityDir, { recursive: true });
-      const modelPath = join11(entityDir, "model.dart");
-      await writeFile3(modelPath, generateDartModel2(entity));
-      generated.push(`${dir}/lib/entities/${toSnake(entity.name)}/model.dart`);
-    }
-  }
-  p10.log.success(`Synced ${meta.entities.length} entity(s):`);
-  for (const f of generated) {
-    p10.log.info(`  ${f}`);
-  }
-  if (hasFrontend) {
-    p10.log.info("");
-    p10.log.info("Frontend usage:");
-    for (const entity of meta.entities) {
-      const className = toPascal2(entity.name);
-      p10.log.info(
-        `  import type { ${className} } from '../types/${toKebab(toSnake(entity.name))}';`
-      );
-    }
-  }
-  p10.outro("Types are up to date.");
-}
-function detectMetaUrl(cwd) {
-  const envFiles = [".env", ".env.dev", ".env.local"];
-  for (const envFile of envFiles) {
-    const envPath = join11(cwd, envFile);
-    if (existsSync11(envPath)) {
-      try {
-        const content = readFileSync(envPath, "utf-8");
-        const match = content.match(/VITE_API_URL\s*=\s*(.+)/);
-        if (match) {
-          const base = match[1].trim().replace(/["']/g, "");
-          return `${base}/api/v1/_meta`;
-        }
-      } catch {
-      }
-    }
-  }
-  const frontendEnvFiles = [
-    "frontend/.env",
-    "frontend/.env.local",
-    "frontend/.env.dev"
-  ];
-  for (const envFile of frontendEnvFiles) {
-    const envPath = join11(cwd, envFile);
-    if (existsSync11(envPath)) {
-      try {
-        const content = readFileSync(envPath, "utf-8");
-        const match = content.match(/VITE_API_URL\s*=\s*(.+)/);
-        if (match) {
-          const base = match[1].trim().replace(/["']/g, "");
-          return `${base}/api/v1/_meta`;
-        }
-      } catch {
-      }
-    }
-  }
-  return "http://localhost:8000/api/v1/_meta";
-}
-
 // src/index.ts
 var args = process.argv.slice(2);
 function matchFeatureFlag(arg, argv, i) {
@@ -4353,10 +4150,6 @@ function parseArgs() {
       command = "gen";
       continue;
     }
-    if (arg === "sync" && !name) {
-      command = "sync";
-      continue;
-    }
     if (arg === "--components") {
       const val = args[++i];
       if (val) {
@@ -4406,11 +4199,6 @@ function parseArgs() {
       flags.backend = true;
       continue;
     }
-    if (arg === "--url") {
-      const val = args[++i];
-      if (val) extraArgs.push(`--url=${val}`);
-      continue;
-    }
     if (arg === "--help" || arg === "-h") {
       printHelp();
       process.exit(0);
@@ -4459,7 +4247,6 @@ function printHelp() {
     projx pin --list              Show all skip patterns
     projx doctor [--fix]          Health check for projx project
     projx gen entity <name>       Generate a new entity
-    projx sync [--url <url>]      Sync types from running backend
 
   Options:
     --components <list>  Comma-separated: fastapi,fastify,express,frontend,mobile,e2e,infra
@@ -4475,7 +4262,7 @@ function printHelp() {
     npx create-projx my-app
     npx create-projx my-app --components fastapi,frontend,e2e
     npx create-projx my-app --components express,frontend,e2e --orm drizzle
-    npx create-projx my-app --components fastify,frontend,mobile --auth fastify,frontend,mobile
+    npx create-projx my-app --components fastify,frontend,mobile --auth fastify
     npx create-projx my-app -y
     npx create-projx add frontend mobile
     npx create-projx add fastify --name email-ingestor
@@ -4549,12 +4336,6 @@ async function main() {
     await doctor(process.cwd(), flags.fix);
     return;
   }
-  if (command === "sync") {
-    const urlArg = extraArgs.find((a) => a.startsWith("--url="));
-    const url = urlArg ? urlArg.split("=").slice(1).join("=") : void 0;
-    await sync(process.cwd(), url);
-    return;
-  }
   if (command === "gen") {
     const subcommand = extraArgs[0];
     if (subcommand !== "entity" || !extraArgs[1]) {
@@ -4567,7 +4348,7 @@ async function main() {
     const fieldsArg = extraArgs.find((a) => a.startsWith("--fields="));
     const fieldsFlag = fieldsArg ? fieldsArg.split("=").slice(1).join("=") : void 0;
     const backendFlag = flags.ai ? "fastapi" : flags.backend ? "fastify" : void 0;
-    await gen(process.cwd(), entityName, fieldsFlag, backendFlag);
+    await gen(process.cwd(), entityName, fieldsFlag, backendFlag, localRepo);
     return;
   }
   let opts;
@@ -4592,7 +4373,7 @@ async function main() {
     opts.features = options.features ?? opts.features;
   }
   const dest = resolve(process.cwd(), opts.name);
-  if (existsSync12(dest)) {
+  if (existsSync11(dest)) {
     console.error(`Error: ${dest} already exists.`);
     process.exit(1);
   }