@mostajs/setup 2.1.8 → 2.1.10

package/dist/components/SetupWizard.js

@@ -841,7 +841,7 @@ export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNa
                                         padding: 12, borderRadius: 8, marginBottom: 16,
                                         backgroundColor: netTestResult.ok ? '#f0fdf4' : '#fef2f2',
                                         border: `1px solid ${netTestResult.ok ? '#bbf7d0' : '#fecaca'}`,
-                                    }, children: netTestResult.ok ? (_jsxs("div", { children: [_jsx("div", { style: { fontWeight: 600, color: '#166534', marginBottom: 4 }, children: "\u2705 Serveur connecte" }), netTestResult.entities && (_jsxs("div", { style: { fontSize: 13, color: '#374151' }, children: [_jsx("strong", { children: netTestResult.entities.length }), " entites : ", netTestResult.entities.join(', ')] })), netTestResult.transports && (_jsxs("div", { style: { fontSize: 13, color: '#6b7280', marginTop: 4 }, children: ["Transports : ", netTestResult.transports.join(', ')] }))] })) : (_jsxs("div", { style: { color: '#991b1b' }, children: ["\u274C ", netTestResult.error || 'Connexion echouee'] })) }))] })), step === 'admin' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDC64" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.admin.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.admin.description') })] })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.firstName') }), _jsx("input", { style: S.input, value: adminConfig.firstName, onChange: e => setAdminConfig({ ...adminConfig, firstName: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.lastName') }), _jsx("input", { style: S.input, value: adminConfig.lastName, onChange: e => setAdminConfig({ ...adminConfig, lastName: e.target.value }) })] })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.email') }), _jsx("input", { style: S.input, type: "email", value: adminConfig.email, onChange: e => setAdminConfig({ ...adminConfig, email: e.target.value }), placeholder: "admin@example.com" })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.password') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.password, onChange: e => setAdminConfig({ ...adminConfig, password: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.confirmPassword') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.confirmPassword, onChange: e => setAdminConfig({ ...adminConfig, confirmPassword: e.target.value }) })] })] }), adminConfig.password && adminConfig.confirmPassword && adminConfig.password !== adminConfig.confirmPassword && (_jsx("p", { style: { fontSize: 13, color: '#dc2626' }, children: t('setup.admin.passwordMismatch') })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'summary' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\u2699\uFE0F" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.summary.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.summary.description') })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.summary.dbConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsx("span", { style: { fontFamily: 'monospace' }, children: dbSummaryLabel() }), dialect !== 'sqlite' && dbConfig.user && _jsxs("span", { style: { display: 'block', marginTop: 4 }, children: ["Utilisateur: ", dbConfig.user] })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.summary.adminConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsxs("div", { children: [adminConfig.firstName, " ", adminConfig.lastName] }), _jsx("div", { children: adminConfig.email })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.modules.title') }), _jsx("div", { style: S.flexWrap, children: selectedModules.map(key => {
+                                    }, children: netTestResult.ok ? (_jsxs("div", { children: [_jsx("div", { style: { fontWeight: 600, color: '#166534', marginBottom: 4 }, children: "\u2705 Serveur connecte" }), netTestResult.entities && (_jsxs("div", { style: { fontSize: 13, color: '#374151' }, children: [_jsx("strong", { children: netTestResult.entities.length }), " entites : ", netTestResult.entities.join(', ')] })), netTestResult.transports && (_jsxs("div", { style: { fontSize: 13, color: '#6b7280', marginTop: 4 }, children: ["Transports : ", netTestResult.transports.join(', ')] }))] })) : (_jsxs("div", { style: { color: '#991b1b' }, children: ["\u274C ", netTestResult.error || 'Connexion echouee'] })) })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'admin' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\uD83D\uDC64" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.admin.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.admin.description') })] })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.firstName') }), _jsx("input", { style: S.input, value: adminConfig.firstName, onChange: e => setAdminConfig({ ...adminConfig, firstName: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.lastName') }), _jsx("input", { style: S.input, value: adminConfig.lastName, onChange: e => setAdminConfig({ ...adminConfig, lastName: e.target.value }) })] })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.email') }), _jsx("input", { style: S.input, type: "email", value: adminConfig.email, onChange: e => setAdminConfig({ ...adminConfig, email: e.target.value }), placeholder: "admin@example.com" })] }), _jsxs("div", { style: S.formRow, children: [_jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.password') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.password, onChange: e => setAdminConfig({ ...adminConfig, password: e.target.value }) })] }), _jsxs("div", { style: S.formGroup, children: [_jsx("label", { style: S.label, children: t('setup.admin.confirmPassword') }), _jsx("input", { style: S.input, type: "password", value: adminConfig.confirmPassword, onChange: e => setAdminConfig({ ...adminConfig, confirmPassword: e.target.value }) })] })] }), adminConfig.password && adminConfig.confirmPassword && adminConfig.password !== adminConfig.confirmPassword && (_jsx("p", { style: { fontSize: 13, color: '#dc2626' }, children: t('setup.admin.passwordMismatch') })), _jsxs("div", { style: S.navRow, children: [_jsxs("button", { style: S.btn('outline'), onClick: goBack, children: ["\u2190 ", t('setup.back')] }), _jsxs("button", { style: S.btn('primary', !canGoNext()), onClick: goNext, disabled: !canGoNext(), children: [t('setup.next'), " \u2192"] })] })] })), step === 'summary' && (_jsxs("div", { children: [_jsxs("div", { style: S.sectionHeader, children: [_jsx("span", { style: S.sectionIcon, children: "\u2699\uFE0F" }), _jsxs("div", { children: [_jsx("div", { style: S.sectionTitle, children: t('setup.summary.title') }), _jsx("div", { style: S.sectionDesc, children: t('setup.summary.description') })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.summary.dbConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsx("span", { style: { fontFamily: 'monospace' }, children: dbSummaryLabel() }), dialect !== 'sqlite' && dbConfig.user && _jsxs("span", { style: { display: 'block', marginTop: 4 }, children: ["Utilisateur: ", dbConfig.user] })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.summary.adminConfig') }), _jsxs("div", { style: S.summaryText, children: [_jsxs("div", { children: [adminConfig.firstName, " ", adminConfig.lastName] }), _jsx("div", { children: adminConfig.email })] })] }), _jsxs("div", { style: S.summaryCard, children: [_jsx("div", { style: S.summaryTitle, children: t('setup.modules.title') }), _jsx("div", { style: S.flexWrap, children: selectedModules.map(key => {
                                                 const mod = availableModules.find(m => m.key === key);
                                                 return mod ? (_jsxs("span", { style: {
                                                         display: 'inline-flex', alignItems: 'center', gap: 4,

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.8",
+  "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",