create-efc-app 0.7.0 → 0.7.1

package/dist/index.js

@@ -30,12 +30,70 @@ var NO_USER_FEATURES = {
   apiAndBilling: false,
   support: false
 };
+function usesTables(opts) {
+  return opts.database === "postgresql" && opts.modelApi !== "defineModel";
+}
+function orm(opts) {
+  const t = usesTables(opts);
+  const where = (filter) => filter.replace(/\s/g, "") === "{}" ? "" : `{ where: ${filter} }`;
+  const byId = (id) => id === "id" ? "{ id }" : `{ id: ${id} }`;
+  return {
+    findOne: (m, filter) => t ? `${m}.findFirst({ where: ${filter} })` : `${m}.findOne(${filter})`,
+    findById: (m, id) => t ? `${m}.findUnique({ where: ${byId(id)} })` : `${m}.findById(${id})`,
+    find: (m, filter) => t ? `${m}.findMany(${where(filter)})` : `${m}.find(${filter})`,
+    count: (m, filter) => t ? `${m}.count(${where(filter)})` : `${m}.count(${filter})`,
+    create: (m, data) => t ? `${m}.create({ data: ${data} })` : `${m}.create(${data})`,
+    update: (m, id, data) => t ? `${m}.update({ where: ${byId(id)}, data: ${data} })` : `${m}.update(${id}, ${data})`,
+    delete: (m, id) => t ? `${m}.delete({ where: ${byId(id)} })` : `${m}.delete(${id})`
+  };
+}
+function generatedModels(opts) {
+  const uf = opts.userFeatures;
+  const af = opts.adminFeatures;
+  const user = opts.userPortal;
+  const admin = opts.adminPortal;
+  const m = /* @__PURE__ */ new Set();
+  if (user || admin && af.userManagement) m.add("User");
+  if (admin) m.add("Admin");
+  if (user && uf.accountSecurity) m.add("Session");
+  if (user && uf.notifications || admin && af.notificationsAndLogs) m.add("Notification");
+  if (user && uf.filesAndMedia) m.add("File");
+  if (user && uf.support || admin && af.supportManagement) m.add("SupportTicket");
+  if (admin && af.notificationsAndLogs) m.add("AuditLog");
+  if (user && uf.apiAndBilling) m.add("Subscription").add("Invoice").add("ApiKey");
+  if (admin && af.billingManagement) m.add("Plan").add("Coupon");
+  if (opts.rbac && admin && af.adminManagement) m.add("Role");
+  if (admin && af.contentManagement) m.add("FAQ").add("Blog").add("Category");
+  return m;
+}
+function modelApi(opts) {
+  const name = usesTables(opts) ? "defineTable" : "defineModel";
+  return { name, import: `import { ${name} } from 'express-file-cluster';` };
+}
+function refField(opts, r) {
+  if (!usesTables(opts) || !generatedModels(opts).has(r.target)) return r.legacy;
+  const opts2 = `${r.required ? ", required: true" : ""}${r.onDelete === "restrict" ? "" : `, onDelete: '${r.onDelete}'`}`;
+  return `  ${(r.field + ":").padEnd(13)}{ type: 'uuid', ref: '${r.target}'${opts2} },`;
+}
+function relationsOption(opts, rels) {
+  if (!usesTables(opts)) return "";
+  const models = generatedModels(opts);
+  const live = rels.filter((r) => models.has(r.target));
+  if (live.length === 0) return "";
+  const lines = live.map(
+    (r) => `    ${r.name}: { ${r.kind}: '${r.target}', foreignKey: '${r.foreignKey}' },`
+  );
+  return `, {
+  relations: {
+${lines.join("\n")}
+  },
+}`;
+}
 async function scaffold(opts) {
   const dest = path.resolve(process.cwd(), opts.projectName);
   await fs.ensureDir(dest);
   const uf = opts.userFeatures;
-  const af = opts.adminFeatures;
-  const needsUserModel = opts.userPortal || opts.adminPortal && af.userManagement;
+  const models = generatedModels(opts);
   await writePackageJson(dest, opts);
   await writeTsConfig(dest, opts);
   await writeEfcConfig(dest, opts);
@@ -44,28 +102,30 @@ async function scaffold(opts) {
   await writeAgentsMd(dest, opts);
   await writeEnvFiles(dest, opts);
   await writeExampleRoute(dest, opts);
-  if (needsUserModel) await writeUserModel(dest, opts);
-  if (opts.adminPortal) await writeAdminModel(dest, opts);
+  if (models.has("User")) await writeUserModel(dest, opts);
+  if (models.has("Admin")) await writeAdminModel(dest, opts);
   await writeAuthRoutes(dest, opts);
   if (opts.adminPortal) await writeAdminRoutes(dest, opts);
   if (opts.userPortal && uf.profileViewing) await writeUserRoutes(dest, opts);
   if (opts.tasks) await writeExampleTask(dest, opts);
-  if (opts.userPortal && uf.accountSecurity) await writeSessionModel(dest, opts);
-  if (opts.userPortal && uf.notifications || opts.adminPortal && af.notificationsAndLogs)
-    await writeNotificationModel(dest, opts);
-  if (opts.userPortal && uf.filesAndMedia) await writeFileModel(dest, opts);
-  if (opts.userPortal && uf.support || opts.adminPortal && af.supportManagement)
-    await writeSupportTicketModel(dest, opts);
-  if (opts.adminPortal && af.notificationsAndLogs) await writeAuditLogModel(dest, opts);
-  if (opts.userPortal && uf.apiAndBilling) await writeSubscriptionModel(dest, opts);
-  if (opts.adminPortal && af.billingManagement) await writePlanModel(dest, opts);
-  if (opts.userPortal && uf.apiAndBilling) await writeInvoiceModel(dest, opts);
-  if (opts.userPortal && uf.apiAndBilling) await writeApiKeyModel(dest, opts);
-  if (opts.rbac && opts.adminPortal && af.adminManagement) await writeRoleModel(dest, opts);
-  if (opts.adminPortal && af.contentManagement) await writeFAQModel(dest, opts);
-  if (opts.adminPortal && af.contentManagement) await writeBlogModel(dest, opts);
-  if (opts.adminPortal && af.contentManagement) await writeCategoryModel(dest, opts);
-  if (opts.adminPortal && af.billingManagement) await writeCouponModel(dest, opts);
+  const extended = [
+    ["Session", writeSessionModel],
+    ["Notification", writeNotificationModel],
+    ["File", writeFileModel],
+    ["SupportTicket", writeSupportTicketModel],
+    ["AuditLog", writeAuditLogModel],
+    ["Subscription", writeSubscriptionModel],
+    ["Plan", writePlanModel],
+    ["Invoice", writeInvoiceModel],
+    ["ApiKey", writeApiKeyModel],
+    ["Role", writeRoleModel],
+    ["FAQ", writeFAQModel],
+    ["Blog", writeBlogModel],
+    ["Category", writeCategoryModel],
+    ["Coupon", writeCouponModel]
+  ];
+  for (const [name, write] of extended) if (models.has(name)) await write(dest, opts);
+  if (usesTables(opts)) await writeModelIndex(dest, opts);
   if (opts.userPortal) await writeAuthExtendedRoutes(dest, opts);
   if (opts.userPortal) await writeUserExtendedRoutes(dest, opts);
   if (opts.userPortal && uf.apiAndBilling) await writeUserBillingRoutes(dest, opts);
@@ -75,7 +135,7 @@ async function scaffold(opts) {
 }
 async function writePackageJson(dest, opts) {
   const deps = {
-    "express-file-cluster": "^0.7.0"
+    "express-file-cluster": "^0.7.1"
   };
   if (opts.database === "mongodb") deps["mongoose"] = "^9.7.2";
   if (opts.database === "postgresql") {
@@ -229,7 +289,10 @@ Optional \u2014 the same docs over MCP, with search and scaffolding tools:
 - \`src/api/**\` \u2014 every file is a route (\`users/[id].${ext}\` \u2192 \`/v1/api/users/:id\`); export
   uppercase \`GET\`/\`POST\`/\u2026 handlers.
 - \`src/tasks/*.${ext}\` \u2014 background tasks; the file name is the task name (not recursive).
-- \`src/model/*.${ext}\` \u2014 \`defineModel\` models.
+${usesTables(opts) ? `- \`src/model/*.${ext}\` \u2014 \`defineTable\` models (PostgreSQL-native, Prisma-style queries:
+  \`findMany({ where, include })\`, \`create({ data })\`, \`update({ where, data })\`). A \`ref\` is a
+  foreign key; back-relations are in each model's \`relations\`. \`src/model/index.${ext}\` imports
+  them all${opts.language === "typescript" ? " and declares `Tables` (typed `include`)" : ""} \u2014 add new models there.` : `- \`src/model/*.${ext}\` \u2014 \`defineModel\` models.`}
 - \`src/index.${ext}\` is the entry point; it imports \`efc.config.${ext}\` and passes it to \`ignite()\`.
 - Only three import paths exist: \`express-file-cluster\`, \`express-file-cluster/auth\`,
   \`express-file-cluster/tasks\`.
@@ -391,9 +454,9 @@ export default defineTask(async (payload) => {
 }
 async function writeUserModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const User = defineModel('User', {
+export const User = ${modelApi(opts).name}('User', {
   name:               { type: 'string',  required: true },
   email:              { type: 'string',  required: true, unique: true },
   password:           { type: 'string',  required: true },
@@ -406,15 +469,23 @@ export const User = defineModel('User', {
   resetTokenExpiry:   { type: 'date' },
   refreshToken:       { type: 'string' },
   refreshTokenExpiry: { type: 'date' },
-});
+}${relationsOption(opts, [
+    { name: "sessions", kind: "hasMany", target: "Session", foreignKey: "user" },
+    { name: "notifications", kind: "hasMany", target: "Notification", foreignKey: "user" },
+    { name: "files", kind: "hasMany", target: "File", foreignKey: "user" },
+    { name: "tickets", kind: "hasMany", target: "SupportTicket", foreignKey: "user" },
+    { name: "subscriptions", kind: "hasMany", target: "Subscription", foreignKey: "user" },
+    { name: "invoices", kind: "hasMany", target: "Invoice", foreignKey: "user" },
+    { name: "apiKeys", kind: "hasMany", target: "ApiKey", foreignKey: "user" }
+  ])});
 `;
   await fs.outputFile(path.join(dest, "src", "model", `User.${ext}`), content);
 }
 async function writeAdminModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Admin = defineModel('Admin', {
+export const Admin = ${modelApi(opts).name}('Admin', {
   name:               { type: 'string',  required: true },
   email:              { type: 'string',  required: true, unique: true },
   password:           { type: 'string',  required: true },
@@ -425,11 +496,16 @@ export const Admin = defineModel('Admin', {
   resetTokenExpiry:   { type: 'date' },
   refreshToken:       { type: 'string' },
   refreshTokenExpiry: { type: 'date' },
-});
+}${relationsOption(opts, [
+    { name: "assignedTickets", kind: "hasMany", target: "SupportTicket", foreignKey: "assignedTo" },
+    { name: "auditLogs", kind: "hasMany", target: "AuditLog", foreignKey: "admin" },
+    { name: "posts", kind: "hasMany", target: "Blog", foreignKey: "author" }
+  ])});
 `;
   await fs.outputFile(path.join(dest, "src", "model", `Admin.${ext}`), content);
 }
 async function writeAuthRoutes(dest, opts) {
+  const db = orm(opts);
   const ext = opts.language === "typescript" ? "ts" : "js";
   const ts = opts.language === "typescript";
   const loginMeta = opts.routeDocs ? ts ? `import type { RouteMeta } from 'express-file-cluster';
@@ -459,7 +535,7 @@ import crypto from 'node:crypto';
 ${hasUser ? `import { User } from '../../model/User.js';
 ` : ""}${hasAdmin ? `import { Admin } from '../../model/Admin.js';
 ` : ""}` : "";
-  const loginBody = hasAdmin && hasUser ? `  const admin = await Admin.findOne({ email });
+  const loginBody = hasAdmin && hasUser ? `  const admin = await ${db.findOne("Admin", `{ email }`)};
   if (admin) {
     const match = await bcrypt.compare(password, admin.password);
     if (!match) return res.status(401).json({ error: 'Invalid credentials' });
@@ -469,21 +545,21 @@ ${hasUser ? `import { User } from '../../model/User.js';
     return res.json({ message: 'Logged in as admin' });
   }
 
-  const user = await User.findOne({ email });
+  const user = await ${db.findOne("User", `{ email }`)};
   if (!user) return res.status(401).json({ error: 'Invalid credentials' });
   const match = await bcrypt.compare(password, user.password);
   if (!match) return res.status(401).json({ error: 'Invalid credentials' });
   if (!user.isActive) return res.status(403).json({ error: 'Account suspended' });
   await issueToken(res, { id: user.id, role: user.role, email: user.email });
   await issueRefreshToken(res, User, user.id);
-  res.json({ message: 'Logged in' });` : hasAdmin ? `  const admin = await Admin.findOne({ email });
+  res.json({ message: 'Logged in' });` : hasAdmin ? `  const admin = await ${db.findOne("Admin", `{ email }`)};
   if (!admin) return res.status(401).json({ error: 'Invalid credentials' });
   const match = await bcrypt.compare(password, admin.password);
   if (!match) return res.status(401).json({ error: 'Invalid credentials' });
   if (!admin.isActive) return res.status(403).json({ error: 'Account suspended' });
   await issueToken(res, { id: admin.id, role: admin.role, email: admin.email });
   await issueRefreshToken(res, Admin, admin.id);
-  res.json({ message: 'Logged in as admin' });` : `  const user = await User.findOne({ email });
+  res.json({ message: 'Logged in as admin' });` : `  const user = await ${db.findOne("User", `{ email }`)};
   if (!user) return res.status(401).json({ error: 'Invalid credentials' });
   const match = await bcrypt.compare(password, user.password);
   if (!match) return res.status(401).json({ error: 'Invalid credentials' });
@@ -497,11 +573,11 @@ ${loginDbImports}${loginMeta}const REFRESH_TOKEN_TTL_MS = 1000 * 60 * 60 * 24 *
 
 async function issueRefreshToken(
   res: Response,
-  model: { update: (id: string, data: Record<string, unknown>) => Promise<unknown> },
+  model: ${usesTables(opts) ? "{ update: (args: { where: { id: string }; data: Record<string, unknown> }) => Promise<unknown> }" : "{ update: (id: string, data: Record<string, unknown>) => Promise<unknown> }"},
   id: string,
 ): Promise<void> {
   const refreshToken = crypto.randomBytes(40).toString('hex');
-  await model.update(id, { refreshToken, refreshTokenExpiry: new Date(Date.now() + REFRESH_TOKEN_TTL_MS) });
+  await ${db.update("model", "id", "{ refreshToken, refreshTokenExpiry: new Date(Date.now() + REFRESH_TOKEN_TTL_MS) }")};
   res.cookie('efc_refresh_token', refreshToken, {
     httpOnly: true,
     secure: process.env.NODE_ENV === 'production',
@@ -521,7 +597,7 @@ ${loginDbImports}${loginMeta}const REFRESH_TOKEN_TTL_MS = 1000 * 60 * 60 * 24 *
 
 async function issueRefreshToken(res, model, id) {
   const refreshToken = crypto.randomBytes(40).toString('hex');
-  await model.update(id, { refreshToken, refreshTokenExpiry: new Date(Date.now() + REFRESH_TOKEN_TTL_MS) });
+  await ${db.update("model", "id", "{ refreshToken, refreshTokenExpiry: new Date(Date.now() + REFRESH_TOKEN_TTL_MS) }")};
   res.cookie('efc_refresh_token', refreshToken, {
     httpOnly: true,
     secure: process.env.NODE_ENV === 'production',
@@ -625,11 +701,11 @@ ${registerDbImports}${registerMeta}export const POST = async (req: Request, res:
   if (!name || !email || !password) {
     return res.status(400).json({ error: 'name, email and password are required' });
   }
-  const existing = await User.findOne({ email });
+  const existing = await ${db.findOne("User", `{ email }`)};
   if (existing) return res.status(409).json({ error: 'Email already in use' });
   const hashed = await bcrypt.hash(password, 10);
   const verifyToken = crypto.randomBytes(32).toString('hex');
-  const user = await User.create({ name, email, password: hashed, verifyToken });
+  const user = await ${db.create("User", `{ name, email, password: hashed, verifyToken }`)};
 ${sendVerifyEmail}
   const { password: _, verifyToken: __, ...safe } = user;
   res.status(201).json({ message: 'Account created successfully', user: safe });
@@ -639,11 +715,11 @@ ${sendVerifyEmail}
   if (!name || !email || !password) {
     return res.status(400).json({ error: 'name, email and password are required' });
   }
-  const existing = await User.findOne({ email });
+  const existing = await ${db.findOne("User", `{ email }`)};
   if (existing) return res.status(409).json({ error: 'Email already in use' });
   const hashed = await bcrypt.hash(password, 10);
   const verifyToken = crypto.randomBytes(32).toString('hex');
-  const user = await User.create({ name, email, password: hashed, verifyToken });
+  const user = await ${db.create("User", `{ name, email, password: hashed, verifyToken }`)};
 ${sendVerifyEmail}
   const { password: _, verifyToken: __, ...safe } = user;
   res.status(201).json({ message: 'Account created successfully', user: safe });
@@ -685,6 +761,7 @@ ${meMeta}${meMiddlewares}export const GET = async (req, res) => {
   await fs.outputFile(path.join(dest, "src", "api", "auth", `me.${ext}`), meContent);
 }
 async function writeAdminRoutes(dest, opts) {
+  const db = orm(opts);
   const ext = opts.language === "typescript" ? "ts" : "js";
   const ts = opts.language === "typescript";
   const middlewares = opts.rbac ? `export const middlewares = [requireAuth('admin')];
@@ -726,9 +803,9 @@ import type { Request, Response } from 'express';
 ${dashboardDbImport}${dashboardMeta}${middlewares}
 export const GET = async (_req: Request, res: Response) => {
 ${roleGuard}  const [totalUsers, activeUsers, verifiedUsers] = await Promise.all([
-    User.count({}),
-    User.count({ isActive: true }),
-    User.count({ isVerified: true }),
+    ${db.count("User", `{}`)},
+    ${db.count("User", `{ isActive: true }`)},
+    ${db.count("User", `{ isVerified: true }`)},
   ]);
   res.json({ stats: { totalUsers, activeUsers, verifiedUsers } });
 };
@@ -736,9 +813,9 @@ ${roleGuard}  const [totalUsers, activeUsers, verifiedUsers] = await Promise.all
 ${dashboardDbImport}${dashboardMeta}${middlewares}
 export const GET = async (_req, res) => {
 ${roleGuard}  const [totalUsers, activeUsers, verifiedUsers] = await Promise.all([
-    User.count({}),
-    User.count({ isActive: true }),
-    User.count({ isVerified: true }),
+    ${db.count("User", `{}`)},
+    ${db.count("User", `{ isActive: true }`)},
+    ${db.count("User", `{ isVerified: true }`)},
   ]);
   res.json({ stats: { totalUsers, activeUsers, verifiedUsers } });
 };
@@ -798,7 +875,7 @@ ${adminUsersDbImport}${usersListMeta}${middlewares}
 export const GET = async (req: Request, res: Response) => {
 ${roleGuard}  const page = Math.max(1, Number(req.query.page) || 1);
   const limit = Math.min(100, Number(req.query.limit) || 20);
-  const [all, total] = await Promise.all([User.find({}), User.count({})]);
+  const [all, total] = await Promise.all([${db.find("User", `{}`)}, ${db.count("User", `{}`)}]);
   const users = all.slice((page - 1) * limit, page * limit).map(({ password: _, ...u }) => u);
   res.json({ users, total, page, limit });
 };
@@ -806,10 +883,10 @@ ${roleGuard}  const page = Math.max(1, Number(req.query.page) || 1);
 export const POST = async (req: Request, res: Response) => {
 ${roleGuard}  const { name, email, password, role } = req.body;
   if (!name || !email || !password) return res.status(400).json({ error: 'name, email and password are required' });
-  const existing = await User.findOne({ email });
+  const existing = await ${db.findOne("User", `{ email }`)};
   if (existing) return res.status(409).json({ error: 'Email already in use' });
   const hashed = await bcrypt.hash(password, 10);
-  const user = await User.create({ name, email, password: hashed, role: role ?? 'user' });
+  const user = await ${db.create("User", `{ name, email, password: hashed, role: role ?? 'user' }`)};
   const { password: _, ...safe } = user;
   res.status(201).json({ message: 'User created', user: safe });
 };
@@ -818,7 +895,7 @@ ${adminUsersDbImport}${usersListMeta}${middlewares}
 export const GET = async (req, res) => {
 ${roleGuard}  const page = Math.max(1, Number(req.query.page) || 1);
   const limit = Math.min(100, Number(req.query.limit) || 20);
-  const [all, total] = await Promise.all([User.find({}), User.count({})]);
+  const [all, total] = await Promise.all([${db.find("User", `{}`)}, ${db.count("User", `{}`)}]);
   const users = all.slice((page - 1) * limit, page * limit).map(({ password: _, ...u }) => u);
   res.json({ users, total, page, limit });
 };
@@ -826,10 +903,10 @@ ${roleGuard}  const page = Math.max(1, Number(req.query.page) || 1);
 export const POST = async (req, res) => {
 ${roleGuard}  const { name, email, password, role } = req.body;
   if (!name || !email || !password) return res.status(400).json({ error: 'name, email and password are required' });
-  const existing = await User.findOne({ email });
+  const existing = await ${db.findOne("User", `{ email }`)};
   if (existing) return res.status(409).json({ error: 'Email already in use' });
   const hashed = await bcrypt.hash(password, 10);
-  const user = await User.create({ name, email, password: hashed, role: role ?? 'user' });
+  const user = await ${db.create("User", `{ name, email, password: hashed, role: role ?? 'user' }`)};
   const { password: _, ...safe } = user;
   res.status(201).json({ message: 'User created', user: safe });
 };
@@ -884,7 +961,7 @@ import type { Request, Response } from 'express';
 ${adminUserByIdDbImport}${userByIdMeta}${middlewares}
 export const GET = async (req: Request, res: Response) => {
 ${roleGuard}  const { id } = req.params;
-  const user = await User.findById(id);
+  const user = await ${db.findById("User", `id`)};
   if (!user) return res.status(404).json({ error: 'User not found' });
   const { password: _, ...safe } = user;
   res.json({ user: safe });
@@ -893,7 +970,7 @@ ${roleGuard}  const { id } = req.params;
 export const PUT = async (req: Request, res: Response) => {
 ${roleGuard}  const { id } = req.params;
   const { name, email, role, isActive } = req.body;
-  const updated = await User.update(id, { name, email, role, isActive });
+  const updated = await ${db.update("User", `id`, `{ name, email, role, isActive }`)};
   if (!updated) return res.status(404).json({ error: 'User not found' });
   const { password: _, ...safe } = updated;
   res.json({ message: 'User updated', user: safe });
@@ -901,16 +978,16 @@ ${roleGuard}  const { id } = req.params;
 
 export const DELETE = async (req: Request, res: Response) => {
 ${roleGuard}  const { id } = req.params;
-  const user = await User.findById(id);
+  const user = await ${db.findById("User", `id`)};
   if (!user) return res.status(404).json({ error: 'User not found' });
-  await User.delete(id);
+  await ${db.delete("User", `id`)};
   res.json({ message: \`User \${id} deleted\` });
 };
 ` : `import { requireAuth } from 'express-file-cluster/auth';
 ${adminUserByIdDbImport}${userByIdMeta}${middlewares}
 export const GET = async (req, res) => {
 ${roleGuard}  const { id } = req.params;
-  const user = await User.findById(id);
+  const user = await ${db.findById("User", `id`)};
   if (!user) return res.status(404).json({ error: 'User not found' });
   const { password: _, ...safe } = user;
   res.json({ user: safe });
@@ -919,7 +996,7 @@ ${roleGuard}  const { id } = req.params;
 export const PUT = async (req, res) => {
 ${roleGuard}  const { id } = req.params;
   const { name, email, role, isActive } = req.body;
-  const updated = await User.update(id, { name, email, role, isActive });
+  const updated = await ${db.update("User", `id`, `{ name, email, role, isActive }`)};
   if (!updated) return res.status(404).json({ error: 'User not found' });
   const { password: _, ...safe } = updated;
   res.json({ message: 'User updated', user: safe });
@@ -927,9 +1004,9 @@ ${roleGuard}  const { id } = req.params;
 
 export const DELETE = async (req, res) => {
 ${roleGuard}  const { id } = req.params;
-  const user = await User.findById(id);
+  const user = await ${db.findById("User", `id`)};
   if (!user) return res.status(404).json({ error: 'User not found' });
-  await User.delete(id);
+  await ${db.delete("User", `id`)};
   res.json({ message: \`User \${id} deleted\` });
 };
 `;
@@ -939,6 +1016,7 @@ ${roleGuard}  const { id } = req.params;
   );
 }
 async function writeUserRoutes(dest, opts) {
+  const db = orm(opts);
   const ext = opts.language === "typescript" ? "ts" : "js";
   const ts = opts.language === "typescript";
   const middlewares = opts.rbac ? `export const middlewares = [requireAuth('user', 'admin')];
@@ -978,7 +1056,7 @@ import type { Request, Response } from 'express';
 ${profileDbImport}${profileMeta}${middlewares}
 export const GET = async (req: Request, res: Response) => {
   const { id } = (req as any).user;
-  const user = await User.findById(id);
+  const user = await ${db.findById("User", `id`)};
   if (!user) return res.status(404).json({ error: 'User not found' });
   const { password: _, ...safe } = user;
   res.json({ user: safe });
@@ -987,7 +1065,7 @@ export const GET = async (req: Request, res: Response) => {
 export const PUT = async (req: Request, res: Response) => {
   const { id } = (req as any).user;
   const { name, email } = req.body;
-  const updated = await User.update(id, { name, email });
+  const updated = await ${db.update("User", `id`, `{ name, email }`)};
   if (!updated) return res.status(404).json({ error: 'User not found' });
   const { password: _, ...safe } = updated;
   res.json({ message: 'Profile updated', user: safe });
@@ -996,7 +1074,7 @@ export const PUT = async (req: Request, res: Response) => {
 ${profileDbImport}${profileMeta}${middlewares}
 export const GET = async (req, res) => {
   const { id } = req.user;
-  const user = await User.findById(id);
+  const user = await ${db.findById("User", `id`)};
   if (!user) return res.status(404).json({ error: 'User not found' });
   const { password: _, ...safe } = user;
   res.json({ user: safe });
@@ -1005,7 +1083,7 @@ export const GET = async (req, res) => {
 export const PUT = async (req, res) => {
   const { id } = req.user;
   const { name, email } = req.body;
-  const updated = await User.update(id, { name, email });
+  const updated = await ${db.update("User", `id`, `{ name, email }`)};
   if (!updated) return res.status(404).json({ error: 'User not found' });
   const { password: _, ...safe } = updated;
   res.json({ message: 'Profile updated', user: safe });
@@ -1045,10 +1123,10 @@ ${blocks}
 }
 async function writeSessionModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Session = defineModel('Session', {
-  userId:    { type: 'string',  required: true },
+export const Session = ${modelApi(opts).name}('Session', {
+${refField(opts, { field: "user", target: "User", legacy: `  userId:    { type: 'string',  required: true },`, required: true, onDelete: "cascade" })}
   token:     { type: 'string',  required: true, unique: true },
   ip:        { type: 'string',  required: true },
   userAgent: { type: 'string',  required: true },
@@ -1060,10 +1138,10 @@ export const Session = defineModel('Session', {
 }
 async function writeNotificationModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Notification = defineModel('Notification', {
-  userId:  { type: 'string',  required: true },
+export const Notification = ${modelApi(opts).name}('Notification', {
+${refField(opts, { field: "user", target: "User", legacy: `  userId:  { type: 'string',  required: true },`, required: true, onDelete: "cascade" })}
   title:   { type: 'string',  required: true },
   message: { type: 'string',  required: true },
   type:    { type: 'string',  required: true, default: 'info' },
@@ -1075,10 +1153,10 @@ export const Notification = defineModel('Notification', {
 }
 async function writeFileModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const File = defineModel('File', {
-  userId:       { type: 'string',  required: true },
+export const File = ${modelApi(opts).name}('File', {
+${refField(opts, { field: "user", target: "User", legacy: `  userId:       { type: 'string',  required: true },`, required: true, onDelete: "cascade" })}
   filename:     { type: 'string',  required: true },
   originalName: { type: 'string',  required: true },
   mimeType:     { type: 'string',  required: true },
@@ -1091,25 +1169,25 @@ export const File = defineModel('File', {
 }
 async function writeSupportTicketModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const SupportTicket = defineModel('SupportTicket', {
-  userId:     { type: 'string', required: true },
+export const SupportTicket = ${modelApi(opts).name}('SupportTicket', {
+${refField(opts, { field: "user", target: "User", legacy: `  userId:     { type: 'string', required: true },`, required: true, onDelete: "cascade" })}
   subject:    { type: 'string', required: true },
   message:    { type: 'string', required: true },
   status:     { type: 'string', required: true, default: 'open' },
   priority:   { type: 'string', required: true, default: 'normal' },
-  assignedTo: { type: 'string' },
+${refField(opts, { field: "assignedTo", target: "Admin", legacy: `  assignedTo: { type: 'string' },`, onDelete: "setNull" })}
 });
 `;
   await fs.outputFile(path.join(dest, "src", "model", `SupportTicket.${ext}`), content);
 }
 async function writeAuditLogModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const AuditLog = defineModel('AuditLog', {
-  adminId:  { type: 'string', required: true },
+export const AuditLog = ${modelApi(opts).name}('AuditLog', {
+${refField(opts, { field: "admin", target: "Admin", legacy: `  adminId:  { type: 'string', required: true },`, onDelete: "setNull" })}
   action:   { type: 'string', required: true },
   entity:   { type: 'string', required: true },
   entityId: { type: 'string', required: true },
@@ -1121,41 +1199,41 @@ export const AuditLog = defineModel('AuditLog', {
 }
 async function writeSubscriptionModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Subscription = defineModel('Subscription', {
-  userId:      { type: 'string', required: true },
-  planId:      { type: 'string', required: true },
+export const Subscription = ${modelApi(opts).name}('Subscription', {
+${refField(opts, { field: "user", target: "User", legacy: `  userId:      { type: 'string', required: true },`, required: true, onDelete: "cascade" })}
+${refField(opts, { field: "plan", target: "Plan", legacy: `  planId:      { type: 'string', required: true },`, required: true, onDelete: "restrict" })}
   status:      { type: 'string', required: true, default: 'active' },
   startDate:   { type: 'date',   required: true },
   endDate:     { type: 'date',   required: true },
   cancelledAt: { type: 'date' },
-});
+}${relationsOption(opts, [{ name: "invoices", kind: "hasMany", target: "Invoice", foreignKey: "subscription" }])});
 `;
   await fs.outputFile(path.join(dest, "src", "model", `Subscription.${ext}`), content);
 }
 async function writePlanModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Plan = defineModel('Plan', {
+export const Plan = ${modelApi(opts).name}('Plan', {
   name:        { type: 'string',  required: true },
   description: { type: 'string',  required: true },
   price:       { type: 'number',  required: true },
   interval:    { type: 'string',  required: true, default: 'monthly' },
   features:    { type: 'array',   of: 'string', default: [] },
   isActive:    { type: 'boolean', default: true },
-});
+}${relationsOption(opts, [{ name: "subscriptions", kind: "hasMany", target: "Subscription", foreignKey: "plan" }])});
 `;
   await fs.outputFile(path.join(dest, "src", "model", `Plan.${ext}`), content);
 }
 async function writeInvoiceModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Invoice = defineModel('Invoice', {
-  userId:         { type: 'string', required: true },
-  subscriptionId: { type: 'string', required: true },
+export const Invoice = ${modelApi(opts).name}('Invoice', {
+${refField(opts, { field: "user", target: "User", legacy: `  userId:         { type: 'string', required: true },`, required: true, onDelete: "cascade" })}
+${refField(opts, { field: "subscription", target: "Subscription", legacy: `  subscriptionId: { type: 'string', required: true },`, onDelete: "setNull" })}
   amount:         { type: 'number', required: true },
   currency:       { type: 'string', required: true, default: 'USD' },
   status:         { type: 'string', required: true, default: 'pending' },
@@ -1166,10 +1244,10 @@ export const Invoice = defineModel('Invoice', {
 }
 async function writeApiKeyModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const ApiKey = defineModel('ApiKey', {
-  userId:    { type: 'string',  required: true },
+export const ApiKey = ${modelApi(opts).name}('ApiKey', {
+${refField(opts, { field: "user", target: "User", legacy: `  userId:    { type: 'string',  required: true },`, required: true, onDelete: "cascade" })}
   name:      { type: 'string',  required: true },
   key:       { type: 'string',  required: true, unique: true },
   lastUsed:  { type: 'date' },
@@ -1181,9 +1259,9 @@ export const ApiKey = defineModel('ApiKey', {
 }
 async function writeRoleModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Role = defineModel('Role', {
+export const Role = ${modelApi(opts).name}('Role', {
   name:        { type: 'string', required: true, unique: true },
   description: { type: 'string', required: true },
   permissions: { type: 'array',  of: 'string', default: [] },
@@ -1193,9 +1271,9 @@ export const Role = defineModel('Role', {
 }
 async function writeFAQModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const FAQ = defineModel('FAQ', {
+export const FAQ = ${modelApi(opts).name}('FAQ', {
   question:    { type: 'string',  required: true },
   answer:      { type: 'string',  required: true },
   category:    { type: 'string',  required: true, default: 'general' },
@@ -1207,13 +1285,13 @@ export const FAQ = defineModel('FAQ', {
 }
 async function writeBlogModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Blog = defineModel('Blog', {
+export const Blog = ${modelApi(opts).name}('Blog', {
   title:       { type: 'string', required: true },
   slug:        { type: 'string', required: true, unique: true },
   content:     { type: 'string', required: true },
-  authorId:    { type: 'string', required: true },
+${refField(opts, { field: "author", target: "Admin", legacy: `  authorId:    { type: 'string', required: true },`, onDelete: "setNull" })}
   category:    { type: 'string', required: true, default: 'general' },
   tags:        { type: 'array',  of: 'string', default: [] },
   status:      { type: 'string', required: true, default: 'draft' },
@@ -1224,22 +1302,22 @@ export const Blog = defineModel('Blog', {
 }
 async function writeCategoryModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Category = defineModel('Category', {
+export const Category = ${modelApi(opts).name}('Category', {
   name:        { type: 'string', required: true },
   slug:        { type: 'string', required: true, unique: true },
   description: { type: 'string' },
-  parentId:    { type: 'string' },
-});
+${refField(opts, { field: "parent", target: "Category", legacy: `  parentId:    { type: 'string' },`, onDelete: "setNull" })}
+}${relationsOption(opts, [{ name: "children", kind: "hasMany", target: "Category", foreignKey: "parent" }])});
 `;
   await fs.outputFile(path.join(dest, "src", "model", `Category.${ext}`), content);
 }
 async function writeCouponModel(dest, opts) {
   const ext = opts.language === "typescript" ? "ts" : "js";
-  const content = `import { defineModel } from 'express-file-cluster';
+  const content = `${modelApi(opts).import}
 
-export const Coupon = defineModel('Coupon', {
+export const Coupon = ${modelApi(opts).name}('Coupon', {
   code:      { type: 'string',  required: true, unique: true },
   type:      { type: 'string',  required: true, default: 'percent' },
   value:     { type: 'number',  required: true },
@@ -1252,6 +1330,7 @@ export const Coupon = defineModel('Coupon', {
   await fs.outputFile(path.join(dest, "src", "model", `Coupon.${ext}`), content);
 }
 async function writeAuthExtendedRoutes(dest, opts) {
+  const db = orm(opts);
   const ext = opts.language === "typescript" ? "ts" : "js";
   const ts = opts.language === "typescript";
   const mwUser2 = opts.rbac ? `export const middlewares = [requireAuth('user', 'admin')];
@@ -1290,12 +1369,12 @@ async function writeAuthExtendedRoutes(dest, opts) {
     const refreshModelImports = `import { User } from '../../model/User.js';
 ${hasAdmin ? `import { Admin } from '../../model/Admin.js';
 ` : ""}`;
-    const refreshLookup = hasAdmin ? `  const user = await User.findOne({ refreshToken: token });
-  const admin = user ? null : await Admin.findOne({ refreshToken: token });
-  const account = user || admin;` : `  const user = await User.findOne({ refreshToken: token });
+    const refreshLookup = hasAdmin ? `  const user = await ${db.findOne("User", `{ refreshToken: token }`)};
+  const admin = user ? null : await ${db.findOne("Admin", `{ refreshToken: token }`)};
+  const account = user || admin;` : `  const user = await ${db.findOne("User", `{ refreshToken: token }`)};
   const account = user;`;
-    const refreshPersist = hasAdmin ? `  if (user) await User.update(user.id, { refreshToken: newRefreshToken, refreshTokenExpiry });
-  else if (admin) await Admin.update(admin.id, { refreshToken: newRefreshToken, refreshTokenExpiry });` : `  await User.update(user.id, { refreshToken: newRefreshToken, refreshTokenExpiry });`;
+    const refreshPersist = hasAdmin ? `  if (user) await ${db.update("User", `user.id`, `{ refreshToken: newRefreshToken, refreshTokenExpiry }`)};
+  else if (admin) await ${db.update("Admin", `admin.id`, `{ refreshToken: newRefreshToken, refreshTokenExpiry }`)};` : `  await ${db.update("User", `user.id`, `{ refreshToken: newRefreshToken, refreshTokenExpiry }`)};`;
     const refreshContent = ts ? `import { issueToken } from 'express-file-cluster/auth';
 import type { Request, Response } from 'express';
 import crypto from 'node:crypto';
@@ -1376,10 +1455,10 @@ ${veMeta}export const GET = async (req: Request, res: Response) => {
   const { token } = req.query;
   if (!token || typeof token !== 'string') return res.status(400).json({ error: 'token is required' });
 
-  const user = await User.findOne({ verifyToken: token });
+  const user = await ${db.findOne("User", `{ verifyToken: token }`)};
   if (!user) return res.status(400).json({ error: 'Invalid or expired verification token' });
 
-  await User.update(user.id, { isVerified: true, verifyToken: '' });
+  await ${db.update("User", `user.id`, `{ isVerified: true, verifyToken: '' }`)};
   res.json({ message: 'Email verified' });
 };
 
@@ -1387,10 +1466,10 @@ export const POST = async (req: Request, res: Response) => {
   const { email } = req.body;
   if (!email) return res.status(400).json({ error: 'email is required' });
 
-  const user = await User.findOne({ email });
+  const user = await ${db.findOne("User", `{ email }`)};
   if (user && !user.isVerified) {
     const verifyToken = crypto.randomBytes(32).toString('hex');
-    await User.update(user.id, { verifyToken });
+    await ${db.update("User", `user.id`, `{ verifyToken }`)};
 ${sendVerifyEmailResend}  }
 
   res.json({ message: 'Verification email sent' });
@@ -1401,10 +1480,10 @@ ${veMeta}export const GET = async (req, res) => {
   const { token } = req.query;
   if (!token || typeof token !== 'string') return res.status(400).json({ error: 'token is required' });
 
-  const user = await User.findOne({ verifyToken: token });
+  const user = await ${db.findOne("User", `{ verifyToken: token }`)};
   if (!user) return res.status(400).json({ error: 'Invalid or expired verification token' });
 
-  await User.update(user.id, { isVerified: true, verifyToken: '' });
+  await ${db.update("User", `user.id`, `{ isVerified: true, verifyToken: '' }`)};
   res.json({ message: 'Email verified' });
 };
 
@@ -1412,10 +1491,10 @@ export const POST = async (req, res) => {
   const { email } = req.body;
   if (!email) return res.status(400).json({ error: 'email is required' });
 
-  const user = await User.findOne({ email });
+  const user = await ${db.findOne("User", `{ email }`)};
   if (user && !user.isVerified) {
     const verifyToken = crypto.randomBytes(32).toString('hex');
-    await User.update(user.id, { verifyToken });
+    await ${db.update("User", `user.id`, `{ verifyToken }`)};
 ${sendVerifyEmailResend}  }
 
   res.json({ message: 'Verification email sent' });
@@ -1434,11 +1513,11 @@ ${sendVerifyEmailResend}  }
     const fpModelImports = `import { User } from '../../model/User.js';
 ${hasAdmin ? `import { Admin } from '../../model/Admin.js';
 ` : ""}`;
-    const fpLookup = hasAdmin ? `  const user = await User.findOne({ email });
-  const admin = user ? null : await Admin.findOne({ email });` : `  const user = await User.findOne({ email });`;
+    const fpLookup = hasAdmin ? `  const user = await ${db.findOne("User", `{ email }`)};
+  const admin = user ? null : await ${db.findOne("Admin", `{ email }`)};` : `  const user = await ${db.findOne("User", `{ email }`)};`;
     const fpGuard = hasAdmin ? "user || admin" : "user";
-    const fpPersist = hasAdmin ? `    if (user) await User.update(user.id, { resetToken, resetTokenExpiry });
-    else if (admin) await Admin.update(admin.id, { resetToken, resetTokenExpiry });` : `    await User.update(user.id, { resetToken, resetTokenExpiry });`;
+    const fpPersist = hasAdmin ? `    if (user) await ${db.update("User", `user.id`, `{ resetToken, resetTokenExpiry }`)};
+    else if (admin) await ${db.update("Admin", `admin.id`, `{ resetToken, resetTokenExpiry }`)};` : `    await ${db.update("User", `user.id`, `{ resetToken, resetTokenExpiry }`)};`;
     const fpContent = ts ? `import type { Request, Response } from 'express';
 import crypto from 'node:crypto';
 ${mailerTaskImport}${fpModelImports}${fpMeta}const RESET_TOKEN_TTL_MS = 1000 * 60 * 60; // 1 hour
@@ -1490,12 +1569,12 @@ ${sendResetEmail}  }
     const rpModelImports = `import { User } from '../../model/User.js';
 ${hasAdmin ? `import { Admin } from '../../model/Admin.js';
 ` : ""}`;
-    const rpLookup = hasAdmin ? `  const user = await User.findOne({ resetToken: token });
-  const admin = user ? null : await Admin.findOne({ resetToken: token });
-  const account = user || admin;` : `  const user = await User.findOne({ resetToken: token });
+    const rpLookup = hasAdmin ? `  const user = await ${db.findOne("User", `{ resetToken: token }`)};
+  const admin = user ? null : await ${db.findOne("Admin", `{ resetToken: token }`)};
+  const account = user || admin;` : `  const user = await ${db.findOne("User", `{ resetToken: token }`)};
   const account = user;`;
-    const rpPersist = hasAdmin ? `  if (user) await User.update(user.id, { password: hashed, resetToken: '' });
-  else if (admin) await Admin.update(admin.id, { password: hashed, resetToken: '' });` : `  await User.update(user.id, { password: hashed, resetToken: '' });`;
+    const rpPersist = hasAdmin ? `  if (user) await ${db.update("User", `user.id`, `{ password: hashed, resetToken: '' }`)};
+  else if (admin) await ${db.update("Admin", `admin.id`, `{ password: hashed, resetToken: '' }`)};` : `  await ${db.update("User", `user.id`, `{ password: hashed, resetToken: '' }`)};`;
     const rpContent = ts ? `import type { Request, Response } from 'express';
 import bcrypt from 'bcrypt';
 import { revokeAllSessions } from 'express-file-cluster/auth';
@@ -2204,7 +2283,10 @@ export const GET = async (req, res) => {
   }
   if (uf.apiAndBilling) {
     const akListMeta = mkMeta(opts, {
-      GET: { description: "List API keys for the authenticated user.", response: `{ apiKeys: [] }` },
+      GET: {
+        description: "List API keys for the authenticated user.",
+        response: `{ apiKeys: [] }`
+      },
       POST: {
         description: "Generate a new API key for the authenticated user.",
         request: `{ name: 'CI key' }`,
@@ -3447,12 +3529,53 @@ ${roleGuard}  const { status, page = 1, limit = 20 } = req.query;
     );
   }
 }
+async function writeModelIndex(dest, opts) {
+  const ts = opts.language === "typescript";
+  const ext = ts ? "ts" : "js";
+  const names = [...generatedModels(opts)].sort();
+  if (names.length === 0) return;
+  const exports = names.map((n) => `export { ${n} } from './${n}.js';`).join("\n");
+  const tables = ts ? `
+${names.map((n) => `import type { ${n} } from './${n}.js';`).join("\n")}
+
+// Types \`include\` results: relations name models by string, this maps the names to models.
+declare module 'express-file-cluster' {
+  interface Tables {
+${names.map((n) => `    ${n}: typeof ${n};`).join("\n")}
+  }
+}
+` : "";
+  const content = `// Every model, in one import: \`import { User } from '../model/index.js'\` also registers the
+// models its relations reach, which \`include\` needs.
+${exports}
+${tables}`;
+  await fs.outputFile(path.join(dest, "src", "model", `index.${ext}`), content);
+}
+var MODEL_ORDER = [
+  "User",
+  "Admin",
+  "Plan",
+  "Category",
+  "Role",
+  "FAQ",
+  "Coupon",
+  "Session",
+  "Notification",
+  "File",
+  "SupportTicket",
+  "AuditLog",
+  "Subscription",
+  "Invoice",
+  "ApiKey",
+  "Blog"
+];
 async function writeInitMigration(dest, opts) {
   const modelDir = path.join(dest, "src", "model");
   if (!await fs.pathExists(modelDir)) return;
   const ts = opts.language === "typescript";
   const ext = ts ? "ts" : "js";
-  const names = (await fs.readdir(modelDir)).filter((f) => f.endsWith(`.${ext}`)).map((f) => f.slice(0, -(ext.length + 1))).sort();
+  const rank = (n) => MODEL_ORDER.includes(n) ? MODEL_ORDER.indexOf(n) : MODEL_ORDER.length;
+  const names = (await fs.readdir(modelDir)).filter((f) => f.endsWith(`.${ext}`) && f !== `index.${ext}`).map((f) => f.slice(0, -(ext.length + 1))).sort((a, b) => rank(a) - rank(b) || a.localeCompare(b));
   if (names.length === 0) return;
   const imports = names.map((n) => `import { ${n} } from '../model/${n}.js';`).join("\n");
   const typeImport = ts ? "import type { MigrationContext } from 'express-file-cluster';\n" : "";
@@ -3503,6 +3626,22 @@ async function main() {
     ]
   });
   if (p.isCancel(database)) cancel2();
+  let modelApi2;
+  if (database === "postgresql") {
+    const api = await p.select({
+      message: "Models:",
+      options: [
+        {
+          value: "defineTable",
+          label: "defineTable",
+          hint: "PostgreSQL-native \u2014 foreign keys, relations, include, Prisma-style queries"
+        },
+        { value: "defineModel", label: "defineModel", hint: "portable \u2014 the same API on MongoDB" }
+      ]
+    });
+    if (p.isCancel(api)) cancel2();
+    modelApi2 = api;
+  }
   const authStrategy = await p.select({
     message: "Authentication strategy:",
     options: [
@@ -3532,17 +3671,55 @@ async function main() {
     const chosen = await p.multiselect({
       message: "User portal features: (space to toggle, enter to confirm)",
       options: [
-        { value: "profileViewing", label: "Profile viewing & editing", hint: "GET/PUT /user/profile" },
-        { value: "forgotPassword", label: "Forgot / reset password", hint: "forgot-password, reset-password" },
-        { value: "accountSecurity", label: "Change password, 2FA & sessions", hint: "change-password, 2fa/*, sessions/*, token refresh" },
-        { value: "emailVerification", label: "Email verification", hint: "verify-email route + registration flow" },
-        { value: "accountSettings", label: "Account settings", hint: "avatar, settings, account, dashboard, activity" },
+        {
+          value: "profileViewing",
+          label: "Profile viewing & editing",
+          hint: "GET/PUT /user/profile"
+        },
+        {
+          value: "forgotPassword",
+          label: "Forgot / reset password",
+          hint: "forgot-password, reset-password"
+        },
+        {
+          value: "accountSecurity",
+          label: "Change password, 2FA & sessions",
+          hint: "change-password, 2fa/*, sessions/*, token refresh"
+        },
+        {
+          value: "emailVerification",
+          label: "Email verification",
+          hint: "verify-email route + registration flow"
+        },
+        {
+          value: "accountSettings",
+          label: "Account settings",
+          hint: "avatar, settings, account, dashboard, activity"
+        },
         { value: "notifications", label: "Notifications", hint: "user/notifications" },
-        { value: "filesAndMedia", label: "Files, favorites & bookmarks", hint: "files, favorites, bookmarks, search" },
-        { value: "apiAndBilling", label: "API keys & billing", hint: "api-keys, plans, subscription, invoices" },
+        {
+          value: "filesAndMedia",
+          label: "Files, favorites & bookmarks",
+          hint: "files, favorites, bookmarks, search"
+        },
+        {
+          value: "apiAndBilling",
+          label: "API keys & billing",
+          hint: "api-keys, plans, subscription, invoices"
+        },
         { value: "support", label: "Support tickets", hint: "create & view own tickets" }
       ],
-      initialValues: ["profileViewing", "forgotPassword", "accountSecurity", "emailVerification", "accountSettings", "notifications", "filesAndMedia", "apiAndBilling", "support"],
+      initialValues: [
+        "profileViewing",
+        "forgotPassword",
+        "accountSecurity",
+        "emailVerification",
+        "accountSettings",
+        "notifications",
+        "filesAndMedia",
+        "apiAndBilling",
+        "support"
+      ],
       required: false
     });
     if (p.isCancel(chosen)) cancel2();
@@ -3564,16 +3741,49 @@ async function main() {
     const chosen = await p.multiselect({
       message: "Admin panel features: (space to toggle, enter to confirm)",
       options: [
-        { value: "userManagement", label: "User management", hint: "list/create/suspend/verify/export users + dashboard stats" },
-        { value: "adminManagement", label: "Admin & role management", hint: "manage other admins" + (selected.has("rbac") ? " + roles" : "") },
+        {
+          value: "userManagement",
+          label: "User management",
+          hint: "list/create/suspend/verify/export users + dashboard stats"
+        },
+        {
+          value: "adminManagement",
+          label: "Admin & role management",
+          hint: "manage other admins" + (selected.has("rbac") ? " + roles" : "")
+        },
         { value: "analytics", label: "Analytics", hint: "users, revenue, traffic dashboards" },
-        { value: "contentManagement", label: "Content management", hint: "FAQs, blog posts, categories" },
-        { value: "billingManagement", label: "Billing management", hint: "plans, coupons, subscriptions" },
+        {
+          value: "contentManagement",
+          label: "Content management",
+          hint: "FAQs, blog posts, categories"
+        },
+        {
+          value: "billingManagement",
+          label: "Billing management",
+          hint: "plans, coupons, subscriptions"
+        },
         { value: "supportManagement", label: "Support tickets", hint: "view & respond to tickets" },
-        { value: "notificationsAndLogs", label: "Notifications & audit logs", hint: "broadcast + audit/activity/security logs" },
-        { value: "systemSettings", label: "System settings & health", hint: "app settings, health check, cache" }
+        {
+          value: "notificationsAndLogs",
+          label: "Notifications & audit logs",
+          hint: "broadcast + audit/activity/security logs"
+        },
+        {
+          value: "systemSettings",
+          label: "System settings & health",
+          hint: "app settings, health check, cache"
+        }
+      ],
+      initialValues: [
+        "userManagement",
+        "adminManagement",
+        "analytics",
+        "contentManagement",
+        "billingManagement",
+        "supportManagement",
+        "notificationsAndLogs",
+        "systemSettings"
       ],
-      initialValues: ["userManagement", "adminManagement", "analytics", "contentManagement", "billingManagement", "supportManagement", "notificationsAndLogs", "systemSettings"],
       required: false
     });
     if (p.isCancel(chosen)) cancel2();
@@ -3676,6 +3886,7 @@ async function main() {
     adminFeatures,
     rbac: selected.has("rbac"),
     mailer: selected.has("mailer"),
+    ...modelApi2 !== void 0 && { modelApi: modelApi2 },
     ...taskBackend !== void 0 && { taskBackend },
     ...smtpProvider !== void 0 && { smtpProvider },
     ...smtpHost !== void 0 && { smtpHost },
@@ -3727,7 +3938,10 @@ function npmInstall(projectDir) {
 function npmInstallGlobal() {
   return new Promise((resolve, reject) => {
     const child = spawn("npm", ["install", "-g", "express-file-cluster"], { stdio: "ignore" });
-    child.on("exit", (code) => code === 0 ? resolve() : reject(new Error("global install failed")));
+    child.on(
+      "exit",
+      (code) => code === 0 ? resolve() : reject(new Error("global install failed"))
+    );
   });
 }
 main().catch((err) => {