@mostajs/setup 2.1.0 → 2.1.2

package/dist/components/SetupWizard.js

@@ -425,9 +425,83 @@ export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNa
     }, [hydrated, persistState, currentStep, dialect, dbConfig, adminConfig, seedOptions, selectedModules]);
     // --- Detect modules ---
     useEffect(() => {
-        // From setup.json (passed as prop)
+        const declaredKeys = new Set((declaredModules ?? []).map(m => m.key));
+        // If API endpoint available → fetch full catalog, enrich with declared info
+        if (ep.detectModules) {
+            fetch(ep.detectModules)
+                .then(r => r.json())
+                .then((data) => {
+                const apiModules = data.modules || [];
+                if (data.installed)
+                    setDetectedModules(data.installed);
+                // Merge: API modules as base, enrich with setup.json overrides
+                if (declaredModules && declaredModules.length > 0) {
+                    const apiByKey = new Map(apiModules.map(m => [m.key, m]));
+                    // Enrich API modules with declared metadata
+                    for (const dm of declaredModules) {
+                        const existing = apiByKey.get(dm.key);
+                        if (existing) {
+                            if (dm.label)
+                                existing.label = dm.label;
+                            if (dm.description)
+                                existing.description = dm.description;
+                            if (dm.icon)
+                                existing.icon = dm.icon;
+                        }
+                        else {
+                            // Module declared in setup.json but not in API catalog — add it
+                            apiModules.push({
+                                key: dm.key,
+                                label: dm.label ?? dm.key,
+                                description: dm.description ?? '',
+                                icon: dm.icon ?? '📦',
+                                required: dm.required,
+                                default: true,
+                                dependsOn: dm.dependsOn,
+                            });
+                        }
+                    }
+                    setAvailableModules(apiModules);
+                    // Pre-select: declared modules + required
+                    const pre = new Set([
+                        ...declaredKeys,
+                        ...apiModules.filter(m => m.required).map(m => m.key),
+                    ]);
+                    setSelectedModules(Array.from(pre));
+                }
+                else {
+                    setAvailableModules(apiModules);
+                    if (selectedModules.length === 0) {
+                        const pre = new Set([
+                            ...apiModules.filter(m => m.required || m.default).map(m => m.key),
+                            ...(data.installed || []),
+                        ]);
+                        setSelectedModules(Array.from(pre));
+                    }
+                }
+                setModulesDetected(true);
+            })
+                .catch(() => {
+                // API failed — fallback to declared modules only
+                if (declaredModules && declaredModules.length > 0) {
+                    setAvailableModules(declaredModules.map(m => ({
+                        key: m.key,
+                        label: m.label ?? m.key,
+                        description: m.description ?? '',
+                        icon: m.icon ?? '📦',
+                        required: m.required,
+                        default: true,
+                        dependsOn: m.dependsOn,
+                    })));
+                    setSelectedModules(Array.from(declaredKeys));
+                }
+                setModulesDetected(true);
+            });
+            return;
+        }
+        // No API endpoint — use declared modules only (if any)
         if (declaredModules && declaredModules.length > 0) {
-            const mods = declaredModules.map(m => ({
+            setAvailableModules(declaredModules.map(m => ({
                 key: m.key,
                 label: m.label ?? m.key,
                 description: m.description ?? '',
@@ -435,36 +509,13 @@ export default function SetupWizard({ t: tProp, onComplete, endpoints = {}, dbNa
                 required: m.required,
                 default: true,
                 dependsOn: m.dependsOn,
-            }));
-            setAvailableModules(mods);
-            setSelectedModules(declaredModules.map(m => m.key));
-            setModulesDetected(true);
-            return;
-        }
-        // No modules and no endpoint → skip
-        if (!ep.detectModules) {
+            })));
+            setSelectedModules(Array.from(declaredKeys));
             setModulesDetected(true);
             return;
         }
-        // From API endpoint
-        fetch(ep.detectModules)
-            .then(r => r.json())
-            .then((data) => {
-            if (data.modules)
-                setAvailableModules(data.modules);
-            if (data.installed)
-                setDetectedModules(data.installed);
-            if (selectedModules.length === 0) {
-                const mods = data.modules || [];
-                const pre = new Set([
-                    ...mods.filter(m => m.required || m.default).map(m => m.key),
-                    ...(data.installed || []),
-                ]);
-                setSelectedModules(Array.from(pre));
-            }
-            setModulesDetected(true);
-        })
-            .catch(() => setModulesDetected(true));
+        // No endpoint, no declared modules → skip
+        setModulesDetected(true);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     // --- Module toggle ---

package/dist/lib/load-setup-json.js

@@ -102,6 +102,22 @@ function buildConfig(json, repoFactory) {
             }
         };
     }
+    // ── createAdmin (generic — uses repoFactory for 'user' + 'role') ──
+    config.createAdmin = async ({ email, hashedPassword, firstName, lastName }) => {
+        const getRepo = repoFactory ?? defaultRepoFactory;
+        const userRepo = await getRepo('user');
+        const roleRepo = await getRepo('role');
+        // Resolve admin role (seeded in RBAC step just before)
+        const adminRole = await roleRepo.findOne({ name: 'admin' });
+        await userRepo.create({
+            email,
+            password: hashedPassword,
+            firstName,
+            lastName,
+            status: 'active',
+            roles: adminRole ? [adminRole.id] : [],
+        });
+    };
     // ── optionalSeeds ──────────────────────────────────────
     if (json.seeds?.length) {
         config.optionalSeeds = json.seeds.map(seedDef => buildSeedDefinition(seedDef, repoFactory));

package/package.json

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