@mostajs/setup 2.1.9 → 2.1.10

package/dist/lib/setup.js

@@ -142,20 +142,61 @@ async function runNetInstall(installConfig, setupConfig) {
         if (!health.entities?.length) {
             return { ok: false, error: 'Serveur NET accessible mais aucun schema chargé', needsRestart: false };
         }
-        // 3. Seed RBAC via REST (if setup.json has rbac)
-        if (setupConfig.seedRBAC) {
-            // seedRBAC uses the repoFactory which works with direct ORM.
-            // For NET mode, we need to use the NET client instead.
-            // The loadSetupJson with a netRepoFactory will handle this.
-            await setupConfig.seedRBAC();
-            seeded.push('categories', 'permissions', 'roles');
+        // 3. Seed RBAC via NET REST
+        // Read setup.json directly to get RBAC definitions
+        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 { }
+        }
+        if (setupJson?.rbac) {
+            const rbac = setupJson.rbac;
+            // 3a. Upsert categories
+            if (rbac.categories?.length) {
+                for (const cat of rbac.categories) {
+                    await net.upsert('permission_categories', { name: cat.name }, {
+                        name: cat.name, label: cat.label, description: cat.description ?? '',
+                        icon: cat.icon ?? '', order: cat.order ?? 0, system: cat.system ?? true,
+                    });
+                }
+                seeded.push('categories');
+            }
+            // 3b. Upsert permissions — build code→ID map
+            const permissionMap = {};
+            if (rbac.permissions?.length) {
+                for (const pDef of rbac.permissions) {
+                    const displayName = pDef.name ?? pDef.code;
+                    const perm = await net.upsert('permissions', { name: displayName }, {
+                        name: displayName, description: pDef.description, category: pDef.category,
+                    });
+                    permissionMap[pDef.code] = perm.id;
+                }
+                seeded.push('permissions');
+            }
+            // 3c. Upsert roles with permission IDs
+            if (rbac.roles?.length) {
+                const allPermIds = Object.values(permissionMap);
+                for (const roleDef of rbac.roles) {
+                    const permissionIds = roleDef.permissions.includes('*')
+                        ? allPermIds
+                        : roleDef.permissions.map((code) => permissionMap[code]).filter(Boolean);
+                    await net.upsert('roles', { name: roleDef.name }, {
+                        name: roleDef.name, description: roleDef.description ?? '', permissions: permissionIds,
+                    });
+                }
+                seeded.push('roles');
+            }
         }
-        // 4. Create admin user via REST
+        // 4. Create admin user via NET REST
         if (installConfig.admin.email) {
             const bcryptModule = await import('bcryptjs');
             const bcrypt = bcryptModule.default || bcryptModule;
             const hashedPassword = await bcrypt.hash(installConfig.admin.password, 12);
-            // Find admin role
             const adminRole = await net.findOne('roles', { name: 'admin' });
             await net.create('users', {
                 email: installConfig.admin.email,
@@ -167,13 +208,44 @@ async function runNetInstall(installConfig, setupConfig) {
             });
             seeded.push('admin');
         }
-        // 5. Optional seeds via REST
-        if (setupConfig.optionalSeeds && installConfig.seed) {
-            for (const seedDef of setupConfig.optionalSeeds) {
-                if (installConfig.seed[seedDef.key]) {
-                    await seedDef.run({});
-                    seeded.push(seedDef.key);
+        // 5. Optional seeds via NET REST
+        if (setupJson?.seeds && installConfig.seed) {
+            for (const seedDef of setupJson.seeds) {
+                if (!installConfig.seed[seedDef.key])
+                    continue;
+                // Resolve lookupFields
+                const resolved = {};
+                if (seedDef.lookupFields) {
+                    for (const [field, lookup] of Object.entries(seedDef.lookupFields)) {
+                        const found = await net.findOne(lookup.collection, { [lookup.match]: lookup.value });
+                        if (found)
+                            resolved[field] = found.id;
+                    }
+                }
+                for (const rawItem of seedDef.data) {
+                    const item = { ...(seedDef.defaults ?? {}), ...resolved, ...rawItem };
+                    // Hash field if configured
+                    if (seedDef.hashField && item[seedDef.hashField]) {
+                        const bcryptModule = await import('bcryptjs');
+                        const bcrypt = bcryptModule.default || bcryptModule;
+                        item[seedDef.hashField] = await bcrypt.hash(String(item[seedDef.hashField]), 12);
+                    }
+                    // Resolve role name → role ID
+                    if (seedDef.roleField && item[seedDef.roleField]) {
+                        const role = await net.findOne('roles', { name: String(item[seedDef.roleField]) });
+                        if (role)
+                            item.roles = [role.id];
+                        delete item[seedDef.roleField];
+                    }
+                    // Upsert or create
+                    if (seedDef.match) {
+                        await net.upsert(seedDef.collection, { [seedDef.match]: item[seedDef.match] }, item);
+                    }
+                    else {
+                        await net.create(seedDef.collection, item);
+                    }
                 }
+                seeded.push(seedDef.key);
             }
         }
         return { ok: true, needsRestart: false, seeded };

package/package.json

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