@mostajs/setup 2.0.2 → 2.1.1

package/dist/api/routes.d.ts

@@ -0,0 +1,46 @@
+import type { MostaSetupConfig } from '../types/index.js';
+type NeedsSetupFn = () => Promise<boolean>;
+type GetSetupConfigFn = () => Promise<MostaSetupConfig>;
+export interface SetupRoutesConfig {
+    needsSetup: NeedsSetupFn;
+    getSetupConfig: GetSetupConfigFn;
+}
+/**
+ * Creates GET, POST, DELETE, PATCH handlers for a catch-all [...slug] route.
+ *
+ * Dispatch table (11 slugs):
+ *   status         GET
+ *   test-db        POST
+ *   create-db      POST
+ *   preflight      GET
+ *   detect-modules GET
+ *   install-modules POST
+ *   setup-json     GET POST
+ *   upload-jar     GET POST DELETE PATCH
+ *   wire-module    GET POST
+ *   reconfig       GET POST
+ *   install        POST
+ */
+export declare function createSetupRoutes(config: SetupRoutesConfig): {
+    GET: (req: Request, { params }: {
+        params: Promise<{
+            slug: string[];
+        }>;
+    }) => Promise<Response>;
+    POST: (req: Request, { params }: {
+        params: Promise<{
+            slug: string[];
+        }>;
+    }) => Promise<Response>;
+    DELETE: (req: Request, { params }: {
+        params: Promise<{
+            slug: string[];
+        }>;
+    }) => Promise<Response>;
+    PATCH: (req: Request, { params }: {
+        params: Promise<{
+            slug: string[];
+        }>;
+    }) => Promise<Response>;
+};
+export {};

package/dist/api/routes.js

@@ -0,0 +1,121 @@
+// @mostajs/setup — Catch-all route factory
+// Author: Dr Hamid MADANI drmdh@msn.com
+//
+// Replaces 6+ individual route files with a single [...slug] handler.
+// Usage:
+//   export const { GET, POST, DELETE, PATCH } = createSetupRoutes({
+//     needsSetup: appNeedsSetup,
+//     getSetupConfig,
+//   })
+/**
+ * Creates GET, POST, DELETE, PATCH handlers for a catch-all [...slug] route.
+ *
+ * Dispatch table (11 slugs):
+ *   status         GET
+ *   test-db        POST
+ *   create-db      POST
+ *   preflight      GET
+ *   detect-modules GET
+ *   install-modules POST
+ *   setup-json     GET POST
+ *   upload-jar     GET POST DELETE PATCH
+ *   wire-module    GET POST
+ *   reconfig       GET POST
+ *   install        POST
+ */
+export function createSetupRoutes(config) {
+    const { needsSetup, getSetupConfig } = config;
+    // Lazy-init: handlers are created on first request, not at import time
+    let table = null;
+    async function buildTable() {
+        if (table)
+            return table;
+        // Import all factories
+        const [{ createStatusHandler }, { createTestDbHandler }, { createCreateDbHandler }, { createPreflightHandler }, { createDetectModulesHandler }, { createInstallModulesHandler }, { createSetupJsonHandler }, { createUploadJarHandlers }, { createWireModuleHandler }, { createReconfigHandlers }, { createInstallHandler },] = await Promise.all([
+            import('./status.route.js'),
+            import('./test-db.route.js'),
+            import('./create-db.route.js'),
+            import('./preflight.route.js'),
+            import('./detect-modules.route.js'),
+            import('./install-modules.route.js'),
+            import('./upload-setup-json.route.js'),
+            import('./upload-jar.route.js'),
+            import('./wire-module.route.js'),
+            import('./reconfig.route.js'),
+            import('./install.route.js'),
+        ]);
+        // Build handlers — pass needsSetup / config where required
+        const status = createStatusHandler(needsSetup);
+        const testDb = createTestDbHandler(needsSetup);
+        const createDb = createCreateDbHandler();
+        const preflight = createPreflightHandler();
+        const detectModules = createDetectModulesHandler();
+        const installModules = createInstallModulesHandler(needsSetup);
+        const setupJson = createSetupJsonHandler(needsSetup);
+        const uploadJar = createUploadJarHandlers();
+        const wireModule = createWireModuleHandler();
+        const reconfig = createReconfigHandlers();
+        // install handler needs async setupConfig — wrap it
+        const installHandlers = {
+            POST: async (req) => {
+                const setupConfig = await getSetupConfig();
+                const { POST: installPOST } = createInstallHandler(needsSetup, setupConfig);
+                return installPOST(req);
+            },
+        };
+        table = {
+            'status': { GET: status.GET },
+            'test-db': { POST: testDb.POST },
+            'create-db': { POST: createDb.POST },
+            'preflight': { GET: preflight.GET },
+            'detect-modules': { GET: detectModules.GET },
+            'install-modules': { POST: installModules.POST },
+            'setup-json': { GET: setupJson.GET, POST: setupJson.POST },
+            'upload-jar': { GET: uploadJar.GET, POST: uploadJar.POST, DELETE: uploadJar.DELETE, PATCH: uploadJar.PATCH },
+            'wire-module': { GET: wireModule.GET, POST: wireModule.POST },
+            'reconfig': { GET: reconfig.GET, POST: reconfig.POST },
+            'install': installHandlers,
+        };
+        return table;
+    }
+    function notFound(slug, method) {
+        return Response.json({ error: `Setup route not found: ${method} /api/setup/${slug}` }, { status: 404 });
+    }
+    async function GET(req, { params }) {
+        const { slug } = await params;
+        const key = slug?.[0] || '';
+        const t = await buildTable();
+        const handler = t[key]?.GET;
+        if (!handler)
+            return notFound(key, 'GET');
+        return handler(req);
+    }
+    async function POST(req, { params }) {
+        const { slug } = await params;
+        const key = slug?.[0] || '';
+        const t = await buildTable();
+        const handler = t[key]?.POST;
+        if (!handler)
+            return notFound(key, 'POST');
+        return handler(req);
+    }
+    async function DELETE(req, { params }) {
+        const { slug } = await params;
+        const key = slug?.[0] || '';
+        const t = await buildTable();
+        const handler = t[key]?.DELETE;
+        if (!handler)
+            return notFound(key, 'DELETE');
+        return handler(req);
+    }
+    async function PATCH(req, { params }) {
+        const { slug } = await params;
+        const key = slug?.[0] || '';
+        const t = await buildTable();
+        const handler = t[key]?.PATCH;
+        if (!handler)
+            return notFound(key, 'PATCH');
+        return handler(req);
+    }
+    return { GET, POST, DELETE, PATCH };
+}

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/index.d.ts

@@ -7,6 +7,8 @@ export { MODULES, resolveModuleDependencies } from './data/module-definitions.js
 export { discoverNpmModules } from './lib/discover-modules.js';
 export { loadSetupJson } from './lib/load-setup-json.js';
 export type { SetupJson, SetupJsonRbac, SetupJsonSeed, SetupJsonCategory, SetupJsonPermission, SetupJsonRole } from './lib/load-setup-json.js';
+export { createSetupRoutes } from './api/routes.js';
+export type { SetupRoutesConfig } from './api/routes.js';
 export { createTestDbHandler } from './api/test-db.route.js';
 export { createInstallHandler } from './api/install.route.js';
 export { createStatusHandler } from './api/status.route.js';

package/dist/index.js

@@ -11,7 +11,9 @@ export { MODULES, resolveModuleDependencies } from './data/module-definitions.js
 // Lib
 export { discoverNpmModules } from './lib/discover-modules.js';
 export { loadSetupJson } from './lib/load-setup-json.js';
-// API route factories
+// Catch-all route factory (replaces individual route files in host app)
+export { createSetupRoutes } from './api/routes.js';
+// API route factories (individual — still available for granular use)
 export { createTestDbHandler } from './api/test-db.route.js';
 export { createInstallHandler } from './api/install.route.js';
 export { createStatusHandler } from './api/status.route.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/setup",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "description": "Reusable setup wizard module — multi-dialect DB configuration, .env.local writer, seed runner",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",
@@ -43,6 +43,11 @@
       "import": "./dist/components/SetupWizard.js",
       "default": "./dist/components/SetupWizard.js"
     },
+    "./api/routes": {
+      "types": "./dist/api/routes.d.ts",
+      "import": "./dist/api/routes.js",
+      "default": "./dist/api/routes.js"
+    },
     "./api/reconfig": {
       "types": "./dist/api/reconfig.route.d.ts",
       "import": "./dist/api/reconfig.route.js",