@mostajs/setup 2.1.11 → 2.1.13

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

@@ -1,11 +1,13 @@
 import type { DialectType } from '../types/index.js';
 export interface EnvWriterOptions {
-    dialect: DialectType;
-    uri: string;
+    dialect?: DialectType;
+    uri?: string;
     /** Extra variables to write (e.g. STRIPE_KEY, SMTP_HOST) */
     extraVars?: Record<string, string>;
     /** Default app port (default: 3000) */
     port?: number;
+    /** Skip writing DB_DIALECT/SGBD_URI (for NET mode) */
+    skipDb?: boolean;
 }
 /**
  * Write or update .env.local with DB_DIALECT + SGBD_URI.

package/dist/lib/env-writer.js

@@ -7,7 +7,7 @@ import path from 'path';
  * Preserves commented lines. Returns true if dialect changed (needs restart).
  */
 export async function writeEnvLocal(options) {
-    const { dialect, uri, extraVars, port = 3000 } = options;
+    const { dialect, uri, extraVars, port = 3000, skipDb = false } = options;
     const envPath = path.resolve(process.cwd(), '.env.local');
     let content = '';
     let previousDialect = null;
@@ -20,16 +20,24 @@ export async function writeEnvLocal(options) {
     catch {
         // .env.local doesn't exist yet
     }
-    const schemaValue = dialect !== 'mongodb' ? 'update' : undefined;
     if (content) {
-        // Replace only active (uncommented) lines
-        content = upsertEnvLine(content, 'DB_DIALECT', dialect);
-        content = upsertEnvLine(content, 'SGBD_URI', uri);
-        if (schemaValue) {
-            content = upsertEnvLine(content, 'DB_SCHEMA_STRATEGY', schemaValue);
+        if (skipDb) {
+            // Mode NET : commenter DB_DIALECT, SGBD_URI, DB_SCHEMA_STRATEGY
+            content = content.replace(/^DB_DIALECT=(.+)$/m, '#DB_DIALECT=$1');
+            content = content.replace(/^SGBD_URI=(.+)$/m, '#SGBD_URI=$1');
+            content = content.replace(/^DB_SCHEMA_STRATEGY=(.+)$/m, '#DB_SCHEMA_STRATEGY=$1');
         }
-        else if (/^DB_SCHEMA_STRATEGY=/m.test(content)) {
-            content = content.replace(/^DB_SCHEMA_STRATEGY=.*$/m, '#DB_SCHEMA_STRATEGY=update');
+        else if (dialect && uri) {
+            // Mode ORM : écrire DB_DIALECT + SGBD_URI
+            content = upsertEnvLine(content, 'DB_DIALECT', dialect);
+            content = upsertEnvLine(content, 'SGBD_URI', uri);
+            const schemaValue = dialect !== 'mongodb' ? 'update' : undefined;
+            if (schemaValue) {
+                content = upsertEnvLine(content, 'DB_SCHEMA_STRATEGY', schemaValue);
+            }
+            else if (/^DB_SCHEMA_STRATEGY=/m.test(content)) {
+                content = content.replace(/^DB_SCHEMA_STRATEGY=.*$/m, '#DB_SCHEMA_STRATEGY=update');
+            }
         }
         // Write extra vars
         if (extraVars) {
@@ -42,29 +50,25 @@ export async function writeEnvLocal(options) {
         // Fresh .env.local
         const { randomBytes } = await import('crypto');
         const secret = randomBytes(32).toString('base64');
-        const lines = [
-            `DB_DIALECT=${dialect}`,
-            `SGBD_URI=${uri}`,
-            ...(schemaValue ? [`DB_SCHEMA_STRATEGY=${schemaValue}`] : []),
-            '',
-            '# NextAuth Configuration',
-            `NEXTAUTH_URL=http://localhost:${port}`,
-            `NEXTAUTH_SECRET=${secret}`,
-            `AUTH_SECRET=${secret}`,
-            `NEXT_PUBLIC_APP_URL=http://localhost:${port}`,
-            '',
-            '# Environment',
-            'NODE_ENV=development',
-            `PORT=${port}`,
-            '',
-            ...(extraVars
-                ? ['# App Configuration', ...Object.entries(extraVars).map(([k, v]) => `${k}=${v}`), '']
-                : []),
-        ];
+        const lines = [];
+        if (!skipDb && dialect && uri) {
+            const schemaValue = dialect !== 'mongodb' ? 'update' : undefined;
+            lines.push(`DB_DIALECT=${dialect}`, `SGBD_URI=${uri}`);
+            if (schemaValue)
+                lines.push(`DB_SCHEMA_STRATEGY=${schemaValue}`);
+            lines.push('');
+        }
+        lines.push('# NextAuth Configuration', `NEXTAUTH_URL=http://localhost:${port}`, `NEXTAUTH_SECRET=${secret}`, `AUTH_SECRET=${secret}`, `NEXT_PUBLIC_APP_URL=http://localhost:${port}`, '', '# Environment', 'NODE_ENV=development', `PORT=${port}`, '');
+        if (extraVars) {
+            lines.push('# App Configuration');
+            for (const [k, v] of Object.entries(extraVars))
+                lines.push(`${k}=${v}`);
+            lines.push('');
+        }
         content = lines.join('\n') + '\n';
     }
     fs.writeFileSync(envPath, content, 'utf-8');
-    return previousDialect !== null && previousDialect !== dialect;
+    return previousDialect !== null && previousDialect !== (dialect ?? previousDialect);
 }
 function upsertEnvLine(content, key, value) {
     const regex = new RegExp(`^${key}=.*$`, 'm');

package/dist/lib/setup.js

@@ -121,7 +121,9 @@ async function runNetInstall(installConfig, setupConfig) {
             apiKey: installConfig.net.apiKey,
         });
         // 1. Write .env.local with NET config
+        // En mode NET : pas de DB_DIALECT/SGBD_URI — seulement MOSTA_DATA + MOSTA_NET_URL
         const extraVars = {
+            MOSTA_DATA: 'net',
             MOSTA_NET_URL: installConfig.net.url,
             MOSTA_NET_TRANSPORT: installConfig.net.transport,
             ...(installConfig.net.apiKey ? { MOSTA_NET_API_KEY: installConfig.net.apiKey } : {}),
@@ -131,20 +133,14 @@ async function runNetInstall(installConfig, setupConfig) {
             extraVars['MOSTAJS_MODULES'] = installConfig.modules.join(',');
         }
         await writeEnvLocal({
-            dialect: 'net',
-            uri: installConfig.net.url,
+            skipDb: true, // Ne pas écrire DB_DIALECT/SGBD_URI
             extraVars,
             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 +151,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.13",
   "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": {