@codemoreira/esad 2.0.1-2 → 2.0.1-4

package/bin/esad.js

@@ -29,7 +29,7 @@ program
   .command('dev [id]') // [id] as alias to -i for better UX
   .option('-i, --id <moduleId>', 'The Module ID to run in dev mode')
   .option('-p, --port <port>', 'The port to run the dev server on', '8081')
-  .description('Starts the dev server and updates the local mapping')
+  .description('Starts the development environment for a module or the host application')
   .action(async (id, options) => {
     const opts = { ...options, id: id || options.id };
     await require('../src/cli/commands/dev')(opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemoreira/esad",
-  "version": "2.0.1-2",
+  "version": "2.0.1-4",
   "description": "Easy Super App Development - Zero-Config CLI and DevTools for React Native Module Federation",
   "main": "src/plugin/index.js",
   "types": "./src/plugin/index.d.ts",

package/src/cli/commands/dev.js

@@ -1,72 +1,172 @@
-const { runProcess } = require('../utils/process');
-const { getWorkspaceConfig } = require('../utils/config');
-const fs = require('fs-extra');
-const path = require('path');
-const chalk = require('chalk');
-const { prepareNative } = require('../utils/scaffold');
-const { resolveProjectDir } = require('../utils/resolution');
-
-module.exports = async (options) => {
-  const configObj = getWorkspaceConfig();
-  if (!configObj) {
-    console.error(chalk.red(`❌ Error: esad.config.js not found. Run this from your project root.`));
-    process.exit(1);
-  }
-
-  const config = await configObj.load();
-  const workspaceRoot = configObj.root;
-  const projectName = config.default?.projectName || config.projectName;
-  
-  let cwd = process.cwd();
-  let selectedModuleId = options.id;
-
-  if (selectedModuleId) {
-    const targetDir = resolveProjectDir(selectedModuleId, configObj);
-    if (!targetDir) {
-      console.error(chalk.red(`❌ Error: Module not found: ${selectedModuleId}`));
-      process.exit(1);
-    }
-    cwd = targetDir;
-  }
-
-  const pkgPath = path.join(cwd, 'package.json');
-  const pkg = fs.readJsonSync(pkgPath);
-  const moduleId = selectedModuleId || pkg.name;
-  const port = options.port || '8081';
-
-  // Determine if it's a Host or Module
-  const isHost = pkg.name.endsWith('-host') || pkg.dependencies?.['@callstack/repack'];
-  
-  await prepareNative(cwd, 'all');
-
-  if (isHost && !selectedModuleId) {
-     console.log(`\n🚀 Starting ${chalk.green('Host App')} Dev Server (Re.Pack/Rspack)...\n`);
-     await runProcess('npx', ['react-native', 'webpack-start'], { cwd });
-     return;
-  }
-
-  const { updateDevMode, removeDevMode, syncContextDownwards } = require('../utils/transformer');
-  
-  console.log(`\n⚡ Starting ESAD Dev Server for ${chalk.cyan(moduleId)} on port ${port}...\n`);
-  
-  // Automate devMode update in esad.config.js
-  const localBundleUrl = `http://localhost:${port}/index.bundle`;
-  updateDevMode(configObj.path, moduleId, localBundleUrl);
-  syncContextDownwards(configObj);
-  console.log(chalk.gray(`📡 Mode: Module Dev. Host configured to load ${moduleId} from ${localBundleUrl}`));
-
-  const proc = runProcess('npx', ['react-native', 'webpack-start', '--port', port], { cwd });
-
-  const shutdown = async () => {
-    console.log(`\n🛑 Stopping ESAD Dev Server and reverting config...`);
-    removeDevMode(configObj.path, moduleId);
-    syncContextDownwards(configObj);
-    if (proc.kill) proc.kill();
-    process.exit(0);
-  };
-
-
-  process.on('SIGINT', shutdown);
-  process.on('SIGTERM', shutdown);
-};
-
+const { runProcess } = require('../utils/process');
+const { getWorkspaceConfig } = require('../utils/config');
+const fs = require('fs-extra');
+const path = require('path');
+const chalk = require('chalk');
+const http = require('http');
+const readline = require('readline');
+const { spawn } = require('cross-spawn');
+const { prepareNative } = require('../utils/scaffold');
+const { resolveProjectDir } = require('../utils/resolution');
+
+/**
+ * Check if a port is in use
+ */
+const isPortInUse = (port) => new Promise((resolve) => {
+  const req = http.get(`http://localhost:${port}`, (res) => {
+    resolve(true); 
+  });
+  req.on('error', () => {
+    resolve(false); 
+  });
+  req.end();
+});
+
+const runHostDevFlow = async (cwd) => {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const askQuestion = (query) => new Promise((resolve) => rl.question(query, resolve));
+
+  console.log(`\n${chalk.bold('ESAD Host Dev Manager')}`);
+  console.log(chalk.dim(`---------------------`));
+  console.log(`[a] Run on Android`);
+  console.log(`[i] Run on iOS`);
+  console.log(`[b] Bundler Only`);
+  console.log(`[c] Cancel`);
+  
+  const choice = (await askQuestion(`\nSelect platform: `)).toLowerCase();
+  
+  if (choice === 'c') {
+    console.log(`\n❌ Cancelled.`);
+    rl.close();
+    return;
+  }
+
+  const portBusy = await isPortInUse(8081);
+  let shouldStartBundler = true;
+
+  if (portBusy) {
+    console.log(`\n⚠️  Warning: Port 8081 is already in use.`);
+    console.log(`💡 Skipping Bundler startup. Proceeding with Native Build.\n`);
+    shouldStartBundler = false;
+  }
+
+  if (shouldStartBundler && choice !== 'c') {
+    console.log(`\n🛠️ Starting Rspack Bundler...`);
+    if (process.platform === 'win32') {
+      spawn('cmd', ['/c', 'start', '/D', cwd, 'npx.cmd', 'react-native', 'webpack-start'], { 
+        detached: true, 
+        stdio: 'ignore',
+        shell: true 
+      }).unref();
+    } else {
+      spawn('npx', ['react-native', 'webpack-start'], { 
+        cwd, 
+        detached: true, 
+        stdio: 'inherit', 
+        shell: true 
+      }).unref();
+    }
+
+    console.log(`⏳ Waiting for Rspack Bundler on port 8081...`);
+    const waitForBundler = async () => {
+      for (let i = 0; i < 30; i++) {
+        if (await isPortInUse(8081)) return true;
+        await new Promise(r => setTimeout(r, 2000));
+      }
+      return false;
+    };
+
+    if (!(await waitForBundler())) {
+      console.error(`\n❌ Timeout: Bundler did not respond.`);
+      rl.close();
+      return;
+    }
+    console.log(`✅ Bundler ready!`);
+  }
+
+  if (choice === 'a') {
+    console.log(`🤖 Launching Android...`);
+    await runProcess('react-native', ['run-android', '--no-packager'], cwd);
+  } else if (choice === 'i') {
+    console.log(`🍎 Launching iOS...`);
+    await runProcess('react-native', ['run-ios', '--no-packager'], cwd);
+  }
+
+  rl.close();
+};
+
+module.exports = async (options) => {
+  const configObj = getWorkspaceConfig();
+  if (!configObj) {
+    console.error(chalk.red(`❌ Error: esad.config.js not found. Run this from your project root.`));
+    process.exit(1);
+  }
+
+  const config = configObj.data;
+  const workspaceRoot = configObj.root;
+  const projectName = config.projectName;
+  
+  let cwd = process.cwd();
+  let selectedModuleId = options.id;
+
+  // 1. Module Dev Flow
+  if (selectedModuleId) {
+    const targetDir = resolveProjectDir(selectedModuleId, configObj);
+    if (!targetDir) {
+      console.error(chalk.red(`❌ Error: Module not found: ${selectedModuleId}`));
+      process.exit(1);
+    }
+    cwd = targetDir;
+    
+    const pkg = fs.readJsonSync(path.join(cwd, 'package.json'));
+    const moduleId = selectedModuleId || pkg.name;
+    const port = options.port || '8081';
+
+    await prepareNative(cwd, 'all');
+
+    const { updateDevMode, removeDevMode, syncContextDownwards } = require('../utils/transformer');
+    
+    console.log(`\n⚡ Starting ESAD Dev Server for ${chalk.cyan(moduleId)} on port ${port}...\n`);
+    const localBundleUrl = `http://localhost:${port}/index.bundle`;
+    updateDevMode(configObj.path, moduleId, localBundleUrl);
+    syncContextDownwards(configObj);
+
+    const proc = runProcess('npx', ['react-native', 'webpack-start', '--port', port], { cwd });
+
+    const shutdown = async () => {
+      console.log(`\n🛑 Stopping ESAD Dev Server and reverting config...`);
+      removeDevMode(configObj.path, moduleId);
+      syncContextDownwards(configObj);
+      if (proc.kill) proc.kill();
+      process.exit(0);
+    };
+
+    process.on('SIGINT', shutdown);
+    process.on('SIGTERM', shutdown);
+    return;
+  }
+
+  // 2. Host Dev Flow (Auto-detection)
+  const pkgPath = path.join(cwd, 'package.json');
+  let isHost = fs.existsSync(pkgPath) && fs.readJsonSync(pkgPath).name.endsWith('-host');
+
+  if (!isHost) {
+    const hostDir = path.join(workspaceRoot, `${projectName}-host`);
+    if (fs.existsSync(hostDir)) {
+      cwd = hostDir;
+      isHost = true;
+      console.log(`📂 Auto-detected Host App: ${chalk.dim(path.relative(process.cwd(), hostDir))}`);
+    }
+  }
+
+  if (isHost) {
+    await prepareNative(cwd, 'all');
+    await runHostDevFlow(cwd);
+  } else {
+    console.error(chalk.red(`❌ Error: Could not detect Host or Module context.`));
+    console.log(`👉 Try: esad dev <module-id>`);
+  }
+};

package/src/cli/commands/host.js

@@ -1,152 +1,42 @@
-const { runProcess } = require('../utils/process');
-const path = require('path');
-const fs = require('fs-extra');
-const { spawn } = require('cross-spawn');
-const http = require('http');
-const readline = require('readline');
-const { getWorkspaceConfig } = require('../utils/config');
-const { prepareNative } = require('../utils/scaffold');
-
-const rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout
-});
-
-const askQuestion = (query) => new Promise((resolve) => rl.question(query, resolve));
-
-/**
- * Check if a port is in use
- */
-const isPortInUse = (port) => new Promise((resolve) => {
-  const req = http.get(`http://localhost:${port}`, (res) => {
-    resolve(true); // Responded, so it's in use
-  });
-  req.on('error', () => {
-    resolve(false); // Refused, so it's free
-  });
-  req.end();
-});
-
-module.exports = async (subcommand) => {
-  let cwd = process.cwd();
-  let pkgPath = path.join(cwd, 'package.json');
-  
-  // Try to find workspace config to resolve host path from root
-  const configObj = getWorkspaceConfig();
-  if (configObj) {
-    const workspaceRoot = path.dirname(configObj.path);
-    const { projectName } = configObj.data;
-    const hostDir = path.join(workspaceRoot, `${projectName}-host`);
-    
-    if (fs.existsSync(hostDir)) {
-      cwd = hostDir;
-      pkgPath = path.join(cwd, 'package.json');
-      console.log(`📂 Auto-detected Host App folder: ${path.relative(process.cwd(), hostDir)}`);
-    }
-  }
-
-  if (!fs.existsSync(pkgPath)) {
-    console.error(`❌ Error: Call this command from inside the Host App or the Workspace Root.`);
-    return;
-  }
-
-  const pkg = fs.readJsonSync(pkgPath);
-
-  // 1. Initial Checks & Automated Native Preparation
-  if (subcommand === 'dev' || subcommand === 'start') {
-    await prepareNative(cwd, 'all');
-
-    // 3. Platform Selection
-    console.log(`\nESAD Host Dev Manager`);
-    console.log(`---------------------`);
-    console.log(`[a] Run on Android`);
-    console.log(`[i] Run on iOS`);
-    console.log(`[b] Bundler Only`);
-    console.log(`[c] Cancel`);
-    
-    const choice = (await askQuestion(`\nSelect platform: `)).toLowerCase();
-    
-    if (choice === 'c') {
-      console.log(`\n❌ Cancelled.`);
-      rl.close();
-      return;
-    }
-
-    // 4. Check for Port 8081
-    const portBusy = await isPortInUse(8081);
-    let shouldStartBundler = true;
-
-    if (portBusy) {
-      console.log(`\n⚠️  Warning: Port 8081 is already in use by another process.`);
-      console.log(`💡 Skipping Bundler startup - assuming it's already running. Proceeding with Native Build only.\n`);
-      shouldStartBundler = false;
-    }
-
-    // 4. Start Bundler in a New Window (if needed)
-    if (shouldStartBundler && choice !== 'c') {
-      console.log(`\n🛠️ Starting Rspack Bundler in a new window...`);
-      if (process.platform === 'win32') {
-        const npxCmd = 'npx.cmd';
-        spawn('cmd', ['/c', 'start', '/D', cwd, npxCmd, 'react-native', 'webpack-start'], { 
-          detached: true, 
-          stdio: 'ignore',
-          shell: true 
-        }).unref();
-      } else {
-        spawn('npx', ['react-native', 'webpack-start'], { 
-          cwd, 
-          detached: true, 
-          stdio: 'inherit', 
-          shell: true 
-        }).unref();
-      }
-
-      // 5. Wait for Bundler (Port 8081)
-      console.log(`⏳ Waiting for Rspack Bundler to initialize on port 8081...`);
-      const waitForBundler = async () => {
-        for (let i = 0; i < 30; i++) {
-          if (await isPortInUse(8081)) return true;
-          await new Promise(r => setTimeout(r, 2000));
-        }
-        return false;
-      };
-
-      const isReady = await waitForBundler();
-      if (!isReady) {
-        console.error(`\n❌ Timeout: Bundler did not respond after 60 seconds.`);
-        rl.close();
-        return;
-      }
-      console.log(`✅ Bundler stable and ready to use!`);
-    }
-
-    // 6. Launch Native App
-    if (choice === 'a') {
-      console.log(`🤖 Compiling and launching on Android...`);
-      await runProcess('react-native', ['run-android', '--no-packager'], cwd);
-    } else if (choice === 'i') {
-      console.log(`🍎 Compiling and launching on iOS...`);
-      await runProcess('react-native', ['run-ios', '--no-packager'], cwd);
-    } else if (choice === 'b') {
-      if (portBusy) {
-        console.log(`✨ Bundler is already active. You can launch manual native runs.`);
-      } else {
-        console.log(`✨ Bundler is running. You can open the app manually.`);
-      }
-    }
-
-    rl.close();
-  } else {
-    // Other subcommands (android, ios directly)
-    try {
-      if (subcommand === 'android') {
-        await runProcess('react-native', ['run-android', '--no-packager'], cwd);
-      } else if (subcommand === 'ios') {
-        await runProcess('react-native', ['run-ios', '--no-packager'], cwd);
-      }
-    } catch (err) {
-      console.error(`❌ Error running host command: ${err.message}`);
-    }
-    rl.close();
-  }
-};
+const { runProcess } = require('../utils/process');
+const path = require('path');
+const fs = require('fs-extra');
+const { getWorkspaceConfig } = require('../utils/config');
+
+module.exports = async (subcommand) => {
+  let cwd = process.cwd();
+  let pkgPath = path.join(cwd, 'package.json');
+  
+  const configObj = getWorkspaceConfig();
+  if (configObj) {
+    const workspaceRoot = configObj.root;
+    const { projectName } = configObj.data;
+    const hostDir = path.join(workspaceRoot, `${projectName}-host`);
+    
+    if (fs.existsSync(hostDir)) {
+      cwd = hostDir;
+      pkgPath = path.join(cwd, 'package.json');
+    }
+  }
+
+  if (!fs.existsSync(pkgPath)) {
+    console.error(`❌ Error: Call this command from inside the Host App or the Workspace Root.`);
+    return;
+  }
+
+  // Handle direct platform commands
+  try {
+    if (subcommand === 'android') {
+      console.log(`🤖 Compiling and launching on Android...`);
+      await runProcess('react-native', ['run-android', '--no-packager'], cwd);
+    } else if (subcommand === 'ios') {
+      console.log(`🍎 Compiling and launching on iOS...`);
+      await runProcess('react-native', ['run-ios', '--no-packager'], cwd);
+    } else {
+      console.log(`\n💡 Tip: Use 'esad dev' for the interactive dev manager.`);
+      console.log(`   Or use 'esad host android' / 'esad host ios' for direct runs.`);
+    }
+  } catch (err) {
+    console.error(`❌ Error running host command: ${err.message}`);
+  }
+};

package/src/cli/commands/init.js

@@ -63,13 +63,23 @@ export default {
     await renameProject(hostDir, hostName);
     
     // Inject local context mock immediately to avoid crashes on fresh boot
-    fs.writeJsonSync(path.join(hostDir, '.esad.context.json'), { projectName, devMode: {} }, { spaces: 2 });
+    const context = { projectName, devMode: {} };
+    fs.writeJsonSync(path.join(hostDir, '.esad.context.json'), context, { spaces: 2 });
     
-    console.log(`\n📦 Installing dependencies into host...`);
+    // Stabilize filesystem before heavy operations
+    await new Promise(res => setTimeout(res, 500));
+
+    console.log(`\n📦 Installing dependencies into host (this may take a minute)...`);
     await runProcess('npm', ['install'], { cwd: hostDir });
-    console.log(`\n🎉 ESAD Workspace Initialized!`);
-    console.log(`-> cd ${projectName}/${hostName}\n-> esad host dev (to start Host)`);
+    
+    console.log(chalk.green(`\n🎉 ESAD Workspace Initialized successfully!`));
+    console.log(chalk.cyan(`\n👉 Next steps:`));
+    console.log(`   1. cd ${projectName}/${hostName}`);
+    console.log(`   2. esad host dev (to start Host)`);
+    console.log(`   3. esad dev (in a module folder to federate)\n`);
   } catch (err) {
-    console.error(`❌ Failed to init Host:`, err.message);
+    console.error(chalk.red(`\n❌ Failed to initialize workspace:`));
+    console.error(chalk.yellow(`   ${err.message}`));
+    console.log(chalk.dim(`\n   Check npm logs if it was an installation error.`));
   }
 };

package/src/cli/utils/config.js

@@ -20,15 +20,14 @@ const getWorkspaceConfig = () => {
 
   try {
     const jiti = createJiti(__filename);
-    const configModule = jiti(configPath);
-    // jiti.import returns a promise for async imports if needed, but for esad.config.js 
-    // we expect a sync structure or we resolve it.
-    // However, jiti v2 import is async.
-    
+    let configData = jiti(configPath);
+    if (configData.default) configData = configData.default;
+
     return { 
       path: configPath, 
       root: path.dirname(configPath),
-      load: () => configModule 
+      data: configData,
+      load: () => configData 
     };
   } catch (err) {
     console.error(`❌ Failed to load esad.config.js: ${err.message}`);

package/src/cli/utils/process.js

@@ -3,7 +3,8 @@ const nativeSpawn = require('child_process').spawn;
 const path = require('path');
 const fs = require('fs-extra');
 
-const runProcess = (cmd, args, cwd = process.cwd()) => {
+const runProcess = (cmd, args, options = process.cwd()) => {
+    const cwd = typeof options === 'string' ? options : (options.cwd || process.cwd());
     let childRef;
     const promise = new Promise((resolve, reject) => {
       let finished = false;

package/src/cli/utils/transformer.js

@@ -10,20 +10,19 @@ const updateDevMode = (configPath, moduleId, url) => {
 
   // 1. Ensure devMode object exists
   if (!content.includes('devMode:')) {
-    // Inject devMode before the last closing brace (naive but effective for clean configs)
-    content = content.replace(/}([^}]*)$/, `  devMode: {},\n}$1`);
+    // Inject devMode after the opening brace of export default
+    content = content.replace(/(export default\s*\{)/, `$1\n  devMode: {},\n`);
   }
 
   // 2. Add or update the module entry
   const entryRegex = new RegExp(`(['"]${moduleId}['"]|${moduleId}):\\s*['"]([^'"]*)['"]`, 'g');
   
   if (entryRegex.test(content)) {
-    // Update existing
-    content = content.replace(entryRegex, `$1: '${url}'`);
+    // Update existing entry
+    content = content.replace(entryRegex, `'${moduleId}': '${url}'`);
   } else {
-    // Insert new entry into devMode object
-    const devModeRegex = /(devMode:\s*{)/;
-    content = content.replace(devModeRegex, `$1\n    '${moduleId}': '${url}',`);
+    // Insert new entry right after devMode: {
+    content = content.replace(/(devMode:\s*\{)/, `$1\n    '${moduleId}': '${url}',`);
   }
 
   fs.writeFileSync(configPath, content);
@@ -44,9 +43,9 @@ const clearAllDevMode = (configPath) => {
   if (!fs.existsSync(configPath)) return;
   let content = fs.readFileSync(configPath, 'utf8');
 
-  // Remove the entire devMode block
-  const devModeBlockRegex = /\s*devMode:\s*{[\s\S]*?},?/g;
-  content = content.replace(devModeBlockRegex, '');
+  // Simply reset devMode to empty object
+  const devModeBlockRegex = /devMode:\s*{[\s\S]*?}/;
+  content = content.replace(devModeBlockRegex, 'devMode: {}');
 
   fs.writeFileSync(configPath, content);
 };