@mostajs/setup 2.1.10 → 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/net-client.d.ts

@@ -14,7 +14,12 @@ export interface NetHealthResponse {
 export declare class NetClient {
     private baseUrl;
     private headers;
+    private collectionMap;
     constructor(config: NetClientConfig);
+    /** Load schema config and build collection name mapping */
+    loadCollectionMap(): Promise<void>;
+    /** Resolve a seed collection name to the actual REST collection */
+    private resolveCollection;
     /** Test connectivity to the NET server */
     health(): Promise<NetHealthResponse>;
     /** Test database connection via NET */

package/dist/lib/net-client.js

@@ -8,6 +8,7 @@
 export class NetClient {
     baseUrl;
     headers;
+    collectionMap = {}; // seedName → REST collection
     constructor(config) {
         this.baseUrl = config.url.replace(/\/$/, '');
         this.headers = { 'Content-Type': 'application/json' };
@@ -15,6 +16,27 @@ export class NetClient {
             this.headers['Authorization'] = `Bearer ${config.apiKey}`;
         }
     }
+    /** Load schema config and build collection name mapping */
+    async loadCollectionMap() {
+        try {
+            const config = await this.getSchemasConfig();
+            for (const s of config.schemas || []) {
+                // Map: entity name lowercase → actual collection
+                // e.g. "Experience" → "experiences", "PermissionCategory" → "permission_categories"
+                this.collectionMap[s.name.toLowerCase()] = s.collection;
+                // Also map collection without trailing 's' → actual collection
+                // e.g. "experience" → "experiences", "passenger" → "passengers"
+                const singular = s.collection.replace(/s$/, '').replace(/ies$/, 'y');
+                this.collectionMap[singular] = s.collection;
+                this.collectionMap[s.collection] = s.collection;
+            }
+        }
+        catch { }
+    }
+    /** Resolve a seed collection name to the actual REST collection */
+    resolveCollection(name) {
+        return this.collectionMap[name] || this.collectionMap[name.toLowerCase()] || name;
+    }
     // ── Health & Status ──────────────────────────────
     /** Test connectivity to the NET server */
     async health() {
@@ -47,7 +69,8 @@ export class NetClient {
     // ── CRUD ─────────────────────────────────────────
     /** Create an entity via REST */
     async create(collection, data) {
-        const res = await fetch(`${this.baseUrl}/api/v1/${collection}`, {
+        const col = this.resolveCollection(collection);
+        const res = await fetch(`${this.baseUrl}/api/v1/${col}`, {
             method: 'POST',
             headers: this.headers,
             body: JSON.stringify(data),
@@ -59,8 +82,9 @@ export class NetClient {
     }
     /** Find one entity by filter */
     async findOne(collection, filter) {
+        const col = this.resolveCollection(collection);
         const params = new URLSearchParams({ filter: JSON.stringify(filter), limit: '1' });
-        const res = await fetch(`${this.baseUrl}/api/v1/${collection}?${params}`, { headers: this.headers });
+        const res = await fetch(`${this.baseUrl}/api/v1/${col}?${params}`, { headers: this.headers });
         const json = await res.json();
         if (json.status === 'error')
             return null;
@@ -69,9 +93,10 @@ export class NetClient {
     }
     /** Upsert: find by filter, update if exists, create if not */
     async upsert(collection, filter, data) {
+        const col = this.resolveCollection(collection);
         const existing = await this.findOne(collection, filter);
         if (existing) {
-            const res = await fetch(`${this.baseUrl}/api/v1/${collection}/${existing.id}`, {
+            const res = await fetch(`${this.baseUrl}/api/v1/${col}/${existing.id}`, {
                 method: 'PUT',
                 headers: this.headers,
                 body: JSON.stringify(data),
@@ -85,8 +110,9 @@ export class NetClient {
     }
     /** Count entities in a collection */
     async count(collection, filter) {
+        const col = this.resolveCollection(collection);
         const params = filter ? new URLSearchParams({ filter: JSON.stringify(filter) }) : '';
-        const res = await fetch(`${this.baseUrl}/api/v1/${collection}/count${params ? '?' + params : ''}`, { headers: this.headers });
+        const res = await fetch(`${this.baseUrl}/api/v1/${col}/count${params ? '?' + params : ''}`, { headers: this.headers });
         const json = await res.json();
         return json.data ?? 0;
     }

package/dist/lib/setup.js

@@ -139,11 +139,7 @@ async function runNetInstall(installConfig, setupConfig) {
         const seeded = [];
         // 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 };
-        }
-        // 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;
@@ -154,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.10",
+  "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": {