@mostajs/setup 2.1.24 → 2.1.27

package/dist/api/install.route.js

@@ -8,10 +8,11 @@ import { runInstall } from '../lib/setup.js';
  */
 export function createInstallHandler(needsSetup, setupConfig) {
     async function POST(req) {
-        if (!(await needsSetup())) {
-            return Response.json({ error: 'Already installed' }, { status: 400 });
-        }
         const body = await req.json();
+        // Skip needsSetup check if admin was already created (wizard creates admin before seed)
+        if (!body.skipCheck && !(await needsSetup())) {
+            return Response.json({ ok: false, error: 'Installation deja effectuee' }, { status: 400 });
+        }
         const result = await runInstall(body, setupConfig);
         return Response.json(result);
     }

package/dist/components/SetupWizard.js

@@ -749,6 +749,7 @@ export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNa
                     admin: { email: adminConfig.email, password: adminConfig.password, firstName: adminConfig.firstName, lastName: adminConfig.lastName },
                     seed: seedOptions,
                     modules: selectedModules,
+                    skipCheck: adminSaveResult?.ok || false, // Skip needsSetup check if admin was created via wizard
                 }),
             });
             const data = await safeJson(res);

package/dist/lib/setup.js

@@ -73,14 +73,50 @@ export async function runInstall(installConfig, setupConfig) {
         // 4. Disconnect existing dialect singleton
         const { disconnectDialect } = await import('@mostajs/orm');
         await disconnectDialect();
-        // 4. Seed RBAC
         const seeded = [];
-        if (setupConfig.seedRBAC) {
-            await setupConfig.seedRBAC();
-            seeded.push('categories', 'permissions', 'roles');
+        // 4. Discover modules and seed RBAC
+        const { discoverModules } = await import('./module-registry.js');
+        const modules = await discoverModules(installConfig.modules);
+        // 4a. Read setup.json for RBAC + seed data
+        const fs = await import('fs');
+        const path = await import('path');
+        let setupJson = null;
+        const setupJsonPath = path.resolve(process.cwd(), 'setup.json');
+        if (fs.existsSync(setupJsonPath)) {
+            try {
+                setupJson = JSON.parse(fs.readFileSync(setupJsonPath, 'utf-8'));
+            }
+            catch { }
+        }
+        // 4b. Seed each module (RBAC gets setup.json.rbac data from Studio)
+        for (const mod of modules) {
+            try {
+                const seedData = setupJson?.[mod.name] || {};
+                await mod.seed(seedData);
+                seeded.push(mod.name);
+            }
+            catch (err) {
+                console.error(`[Setup] Module "${mod.name}" seed failed:`, err);
+            }
+        }
+        // 5. Create admin via rbac module (not setup — rbac handles hash + role)
+        const rbacModule = modules.find(m => m.createAdmin);
+        if (rbacModule && installConfig.admin?.email) {
+            try {
+                await rbacModule.createAdmin({
+                    email: installConfig.admin.email,
+                    password: installConfig.admin.password,
+                    firstName: installConfig.admin.firstName,
+                    lastName: installConfig.admin.lastName,
+                });
+                seeded.push('admin');
+            }
+            catch (err) {
+                console.error('[Setup] createAdmin failed:', err);
+            }
         }
-        // 5. Create admin user
-        if (setupConfig.createAdmin) {
+        else if (setupConfig.createAdmin) {
+            // Legacy fallback — app provides its own createAdmin
             const bcryptModule = await import('bcryptjs');
             const bcrypt = bcryptModule.default || bcryptModule;
             const hashedPassword = await bcrypt.hash(installConfig.admin.password, 12);
@@ -92,16 +128,17 @@ export async function runInstall(installConfig, setupConfig) {
             });
             seeded.push('admin');
         }
-        // 6. Optional seeds (runtime registry or legacy)
-        if (setupConfig.runModuleSeeds) {
-            await setupConfig.runModuleSeeds(installConfig.modules);
-            seeded.push('module-seeds');
-        }
-        else if (setupConfig.optionalSeeds && installConfig.seed) {
+        // 6. Optional seeds from setup.json (app-specific: activities, clients, plans)
+        if (setupConfig.optionalSeeds && installConfig.seed) {
             for (const seedDef of setupConfig.optionalSeeds) {
                 if (installConfig.seed[seedDef.key]) {
-                    await seedDef.run({});
-                    seeded.push(seedDef.key);
+                    try {
+                        await seedDef.run({});
+                        seeded.push(seedDef.key);
+                    }
+                    catch (err) {
+                        console.error(`[Setup] Seed "${seedDef.key}" failed:`, err);
+                    }
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/setup",
-  "version": "2.1.24",
+  "version": "2.1.27",
   "description": "Reusable setup wizard module — multi-dialect DB configuration, .env.local writer, seed runner",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",