@mostajs/setup 2.1.9 → 2.1.11

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

@@ -137,25 +137,67 @@ async function runNetInstall(installConfig, setupConfig) {
             port: setupConfig.defaultPort,
         });
         const seeded = [];
-        // 2. Verify NET server is reachable
+        // 2. Verify NET server is reachable + load collection mapping
         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 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');
+        await net.loadCollectionMap();
+        // 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 +209,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.9",
+  "version": "2.1.11",
   "description": "Reusable setup wizard module — multi-dialect DB configuration, .env.local writer, seed runner",
   "author": "Dr Hamid MADANI <drmdh@msn.com>",
   "license": "MIT",