@mostajs/setup 2.1.11 → 2.1.12

package/dist/index.js

@@ -13,7 +13,7 @@ export { discoverNpmModules } from './lib/discover-modules.js';
 export { loadSetupJson } from './lib/load-setup-json.js';
 // Catch-all route factory (replaces individual route files in host app)
 export { createSetupRoutes } from './api/routes.js';
-// NET client (for setup via @mostajs/net)
+// NET client (setup-specific, with loadCollectionMap + resolveCollection)
 export { NetClient } from './lib/net-client.js';
 // API route factories (individual — still available for granular use)
 export { createTestDbHandler } from './api/test-db.route.js';

package/dist/lib/setup.js

@@ -137,14 +137,9 @@ async function runNetInstall(installConfig, setupConfig) {
             port: setupConfig.defaultPort,
         });
         const seeded = [];
-        // 2. Verify NET server is reachable + load collection mapping
+        // 2. Verify NET server is reachable
         const health = await net.health();
-        if (!health.entities?.length) {
-            return { ok: false, error: 'Serveur NET accessible mais aucun schema chargé', needsRestart: false };
-        }
-        await net.loadCollectionMap();
-        // 3. Seed RBAC via NET REST
-        // Read setup.json directly to get RBAC definitions
+        // 3. Read setup.json for RBAC definitions
         const fs = await import('fs');
         const path = await import('path');
         let setupJson = null;
@@ -155,6 +150,48 @@ async function runNetInstall(installConfig, setupConfig) {
             }
             catch { }
         }
+        // 4. If server has no entities, try sending schemas via POST /api/upload-schemas-json
+        if (!health.entities?.length) {
+            let schemasToSend = [];
+            // Try schemas.json local
+            const schemasJsonPath = path.resolve(process.cwd(), 'schemas.json');
+            if (fs.existsSync(schemasJsonPath)) {
+                try {
+                    schemasToSend = JSON.parse(fs.readFileSync(schemasJsonPath, 'utf-8'));
+                }
+                catch { }
+            }
+            // Fallback: ORM registry
+            if (schemasToSend.length === 0) {
+                try {
+                    const { getAllSchemas } = await import('@mostajs/orm');
+                    schemasToSend = getAllSchemas();
+                }
+                catch { }
+            }
+            if (schemasToSend.length > 0) {
+                // Send schemas to NET server so it can register + create tables
+                try {
+                    const res = await fetch(`${installConfig.net.url}/api/upload-schemas-json`, {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify({ schemas: schemasToSend }),
+                    });
+                    const result = await res.json();
+                    if (result.ok)
+                        seeded.push(`schemas (${schemasToSend.length})`);
+                }
+                catch (e) {
+                    console.error('[Setup] Failed to upload schemas to NET server:', e);
+                }
+            }
+            // Re-check
+            const health2 = await net.health();
+            if (!health2.entities?.length) {
+                return { ok: false, error: 'Serveur NET accessible mais aucun schema charge. Placez un schemas.json dans le repertoire du serveur NET et redemarrez-le.', needsRestart: false };
+            }
+        }
+        await net.loadCollectionMap();
         if (setupJson?.rbac) {
             const rbac = setupJson.rbac;
             // 3a. Upsert categories

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mostajs/setup",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "description": "Reusable setup wizard module — multi-dialect DB configuration, .env.local writer, seed runner",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",
@@ -104,7 +104,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@mostajs/orm": "^1.4.15",
+    "@mostajs/net": "^2.0.0",
+    "@mostajs/orm": "^1.7.0",
     "bcryptjs": "^2.4.3"
   },
   "devDependencies": {