@codemoreira/esad 2.0.1-0 → 2.0.1-2

package/bin/esad.js

@@ -7,14 +7,21 @@ program
   .version(pkg.version)
   .description('esad - Easy Super App Development Toolkit (V2)');
 
-// --- COMMAND: esad create [name] --type [host|module|cdn] ---
+// --- COMMAND: esad init [name] ---
+program
+  .command('init [name]')
+  .description('Creates the base of an ESAD project (Workspace and Host App)')
+  .action(async (name) => {
+    await require('../src/cli/commands/init')(name);
+  });
+
+// --- COMMAND: esad create [name] --type [module|cdn] ---
 program
   .command('create [name]')
-  .option('-t, --type <type>', 'Type of project: host, module, cdn', 'module')
-  .description('Unified scaffolding for host apps, modules, and cdn registries')
+  .option('-t, --type <type>', 'Type of resource: module, cdn', 'module')
+  .description('Expands an existing workspace by scaffolding modules or a local cdn')
   .action(async (name, options) => {
     await require('../src/cli/commands/create')(name, options);
-    process.exit(0);
   });
 
 // --- COMMAND: esad dev [moduleId] ---
@@ -37,7 +44,6 @@ program
   .action(async (id, options) => {
     const opts = { ...options, id: id || options.id };
     await require('../src/cli/commands/build')(opts);
-    process.exit(0);
   });
 
 // --- COMMAND: esad deploy [id] ---
@@ -49,7 +55,6 @@ program
   .action(async (id, options) => {
     const opts = { ...options, id: id || options.id };
     await require('../src/cli/commands/deploy')(opts);
-    process.exit(0);
   });
 
 // --- COMMAND: esad host <sub> ---
@@ -58,7 +63,6 @@ program
   .description('Manage host application (android, ios, login)')
   .action(async (sub) => {
     await require('../src/cli/commands/host')(sub);
-    process.exit(0);
   });
 
 // --- COMMAND: esad doctor ---
@@ -67,7 +71,6 @@ program
   .description('Check environment for common issues')
   .action(async () => {
     await require('../src/cli/commands/doctor')();
-    process.exit(0);
   });
 
 // --- COMMAND: esad link [id] ---
@@ -76,7 +79,6 @@ program
   .description('Optimize development via local filesystem linking')
   .action(async (id) => {
     await require('../src/cli/commands/link')(id);
-    process.exit(0);
   });
 
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemoreira/esad",
-  "version": "2.0.1-0",
+  "version": "2.0.1-2",
   "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",
@@ -50,6 +50,7 @@
     "cross-spawn": "^7.0.3",
     "form-data": "^4.0.0",
     "fs-extra": "^11.2.0",
+    "jiti": "^2.6.1",
     "node-fetch": "^2.7.0",
     "process": "^0.11.10"
   },
@@ -58,4 +59,4 @@
     "@types/react": "^19.2.14",
     "@types/react-native": "^0.72.8"
   }
-}
+}

package/src/cli/commands/build.js

@@ -38,7 +38,7 @@ module.exports = async (options) => {
   syncContextDownwards(configObj);
 
   try {
-    const bundleOutput = path.join(cwd, 'build', 'index.bundle'); // Simplified path as per V2
+    const bundleOutput = path.join(cwd, 'build', platform, 'index.bundle'); 
     fs.ensureDirSync(path.dirname(bundleOutput));
 
     // Run Re.Pack production build

package/src/cli/commands/create.js

@@ -6,68 +6,6 @@ const { cloneTemplate, renameProject } = require('../utils/scaffold');
 const { getWorkspaceConfig } = require('../utils/config');
 const templatesConfig = require('../templates/templates.json');
 
-const initHost = async (projectName) => {
-  const workspaceDir = path.join(process.cwd(), projectName);
-  console.log(`\n🚀 Initializing ESAD Workspace: ${projectName}...\n`);
-  
-  fs.ensureDirSync(workspaceDir);
-
-  const configPath = path.join(workspaceDir, 'esad.config.js');
-  if (!fs.existsSync(configPath)) {
-    const configTemplate = `/**
- * ESAD: Super App Configuration
- */
-export default {
-  projectName: '${projectName}',
-  
-  // 1. Development Overrides
-  // Managed automatically by 'esad dev'
-  devMode: {},
-
-  // 2. Programmable Deployment
-  // Receives the compiled bundle.
-  async deploy(bundle, { version, moduleId, options }) {
-    console.log('🚀 Starting custom upload for ' + moduleId + '...');
-    // return { status: 'mock_success', moduleId, version };
-  }
-};
-`;
-    fs.writeFileSync(configPath, configTemplate);
-    console.log(`✅ Generated programmable configuration: esad.config.js`);
-  }
-
-  const gitignorePath = path.join(workspaceDir, '.gitignore');
-  if (!fs.existsSync(gitignorePath)) {
-    const hostName = `${projectName}-host`;
-    const gitignoreContent = `# ESAD Workspace Git Configuration\n` +
-      `/*\n\n` +
-      `!/${hostName}/\n` +
-      `!/esad.config.js\n` +
-      `!/.gitignore\n` +
-      `\nnode_modules/\n`;
-    fs.writeFileSync(gitignorePath, gitignoreContent);
-    console.log(`✅ Generated .gitignore`);
-  }
-
-  const hostName = `${projectName}-host`;
-  const hostDir = path.join(workspaceDir, hostName);
-  
-  try {
-    await cloneTemplate(templatesConfig.host, hostDir);
-    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 });
-    
-    console.log(`\n📦 Installing dependencies into host...`);
-    await runProcess('npm', ['install'], { cwd: hostDir });
-    console.log(`\n🎉 ESAD Workspace Initialized!`);
-    console.log(`-> cd ${projectName}/${hostName}\n-> esad host dev (to start Host)`);
-  } catch (err) {
-    console.error(`❌ Failed to init Host:`, err.message);
-  }
-};
-
 const createModule = async (moduleName) => {
   const configObj = getWorkspaceConfig();
   if (!configObj) {
@@ -138,11 +76,9 @@ module.exports = async (name, options) => {
   const type = options.type;
 
   if (type === 'host') {
-    if (!name) {
-      console.error(chalk.red('❌ Error: Project name is required for host creation.'));
-      process.exit(1);
-    }
-    return await initHost(name);
+    console.error(chalk.red('❌ Error: The "host" type is no longer supported in create.'));
+    console.error(chalk.yellow('👉 Use "esad init <project-name>" instead to create a new workspace.'));
+    process.exit(1);
   }
 
   if (type === 'module') {
@@ -157,5 +93,5 @@ module.exports = async (name, options) => {
     return await createCdn(name);
   }
 
-  console.error(chalk.red(`❌ Unknown type: ${type}. Valid types are: host, module, cdn.`));
+  console.error(chalk.red(`❌ Unknown type: ${type}. Valid types are: module, cdn.`));
 };

package/src/cli/commands/init.js

@@ -0,0 +1,75 @@
+const fs = require('fs-extra');
+const path = require('path');
+const chalk = require('chalk');
+const { runProcess } = require('../utils/process');
+const { cloneTemplate, renameProject } = require('../utils/scaffold');
+const templatesConfig = require('../templates/templates.json');
+
+module.exports = async (projectName) => {
+  if (!projectName) {
+    console.error(chalk.red('❌ Error: Project name is required to initialize a new ESAD workspace.'));
+    console.error(chalk.yellow('👉 Usage: esad init <project-name>'));
+    process.exit(1);
+  }
+
+  const workspaceDir = path.join(process.cwd(), projectName);
+  console.log(`\n🚀 Initializing ESAD Workspace: ${projectName}...\n`);
+  
+  fs.ensureDirSync(workspaceDir);
+
+  const configPath = path.join(workspaceDir, 'esad.config.js');
+  if (!fs.existsSync(configPath)) {
+    const configTemplate = `/**
+ * ESAD: Super App Configuration
+ */
+export default {
+  projectName: '${projectName}',
+  
+  // 1. Development Overrides
+  // Managed automatically by 'esad dev'
+  devMode: {},
+
+  // 2. Programmable Deployment
+  // Receives the compiled bundle.
+  async deploy(bundle, { version, moduleId, options }) {
+    console.log('🚀 Starting custom upload for ' + moduleId + '...');
+    // return { status: 'mock_success', moduleId, version };
+  }
+};
+`;
+    fs.writeFileSync(configPath, configTemplate);
+    console.log(`✅ Generated programmable configuration: esad.config.js`);
+  }
+
+  const gitignorePath = path.join(workspaceDir, '.gitignore');
+  if (!fs.existsSync(gitignorePath)) {
+    const hostName = `${projectName}-host`;
+    const gitignoreContent = `# ESAD Workspace Git Configuration\n` +
+      `# Note: We use a whitelist approach because modules should be kept in separate repositories.\n` +
+      `/*\n\n` +
+      `!/${hostName}/\n` +
+      `!/esad.config.js\n` +
+      `!/.gitignore\n` +
+      `\nnode_modules/\n`;
+    fs.writeFileSync(gitignorePath, gitignoreContent);
+    console.log(`✅ Generated .gitignore`);
+  }
+
+  const hostName = `${projectName}-host`;
+  const hostDir = path.join(workspaceDir, hostName);
+  
+  try {
+    await cloneTemplate(templatesConfig.host, hostDir);
+    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 });
+    
+    console.log(`\n📦 Installing dependencies into host...`);
+    await runProcess('npm', ['install'], { cwd: hostDir });
+    console.log(`\n🎉 ESAD Workspace Initialized!`);
+    console.log(`-> cd ${projectName}/${hostName}\n-> esad host dev (to start Host)`);
+  } catch (err) {
+    console.error(`❌ Failed to init Host:`, err.message);
+  }
+};

package/src/cli/utils/config.js

@@ -20,7 +20,7 @@ const getWorkspaceConfig = () => {
 
   try {
     const jiti = createJiti(__filename);
-    const configModule = jiti.import(configPath);
+    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.

package/src/cli/utils/process.js

@@ -4,63 +4,69 @@ const path = require('path');
 const fs = require('fs-extra');
 
 const runProcess = (cmd, args, cwd = process.cwd()) => {
-  return new Promise((resolve, reject) => {
-    let finished = false;
-    let started = false;
+    let childRef;
+    const promise = new Promise((resolve, reject) => {
+      let finished = false;
+      let started = false;
 
-    const finalize = (fn, arg) => {
-      if (finished) return;
-      finished = true;
-      fn(arg);
-    };
+      const finalize = (fn, arg) => {
+        if (finished) return;
+        finished = true;
+        fn(arg);
+      };
 
-    const isWin = process.platform === 'win32';
-    const localBinPath = path.join(cwd, 'node_modules', '.bin', isWin ? `${cmd}.cmd` : cmd);
-    
-    let command = cmd;
-    let finalArgs = args;
-    let useNativeSpawn = false;
+      const isWin = process.platform === 'win32';
+      const localBin = isWin ? `${cmd}.cmd` : cmd;
+      const localBinPath = path.join(cwd, 'node_modules', '.bin', localBin);
+      
+      let command = cmd;
+      let finalArgs = args;
+      let useNativeSpawn = false;
 
-    if (fs.existsSync(localBinPath)) {
-      command = isWin ? `node_modules\\.bin\\${cmd}.cmd` : `./node_modules/.bin/${cmd}`;
-      useNativeSpawn = isWin; // Use native spawn on Windows for local binaries to avoid cross-spawn issues
-    } else {
-      command = isWin ? 'npx.cmd' : 'npx';
-      finalArgs = [cmd, ...args];
-    }
-    
-    console.log(`[ESAD] Resolved Command: ${command} (CWD: ${cwd})`);
+      if (fs.existsSync(localBinPath)) {
+        // 1. Priority: Local node_modules/.bin (fastest & consistent)
+        command = isWin ? `node_modules\\.bin\\${localBin}` : `./node_modules/.bin/${localBin}`;
+        useNativeSpawn = isWin; 
+      } else {
+        // 2. Fallback: System Path (git, npm, npx, etc)
+        // cross-spawn handles .cmd/.exe resolution automatically
+        command = cmd;
+        finalArgs = args;
+        useNativeSpawn = false;
+      }
+      
+      console.log(`[ESAD] Resolved Command: ${command} (CWD: ${cwd})`);
 
-    // Mark as started after a short delay
-    setTimeout(() => { started = true; }, 2000);
+      setTimeout(() => { started = true; }, 2000);
 
-    const spawnFn = useNativeSpawn ? nativeSpawn : spawn;
-    const child = spawnFn(command, finalArgs, { 
-      stdio: 'inherit', 
-      cwd, 
-      shell: true
-    });
+      const spawnFn = useNativeSpawn ? nativeSpawn : spawn;
+      childRef = spawnFn(command, finalArgs, { 
+        stdio: 'inherit', 
+        cwd, 
+        shell: true
+      });
 
-    child.on('error', err => {
-      // If the process already "started" (ran for > 2s), we ignore early-spawn errors
-      // as they are likely shell artifacts from the process exiting.
-      if (started && err.code === 'ENOENT') {
-        console.warn(`[ESAD] Warning: Late ENOENT ignored for ${cmd}.`);
-        return;
-      }
+      childRef.on('error', err => {
+        if (started && err.code === 'ENOENT') {
+          console.warn(`[ESAD] Warning: Late ENOENT ignored for ${cmd}.`);
+          return;
+        }
+        finalize(reject, err);
+      });
 
-      console.error(`[ESAD] Process Error: ${err.code} - ${err.message}`);
-      finalize(reject, new Error(`Failed to start ${cmd}: ${err.message}`));
+      childRef.on('close', code => {
+        if (code !== 0) {
+          finalize(reject, new Error(`Process ${cmd} exited with code ${code}`));
+        } else {
+          finalize(resolve);
+        }
+      });
     });
 
-    child.on('close', code => {
-      if (code !== 0) {
-        finalize(reject, new Error(`Process ${cmd} exited with code ${code}`));
-      } else {
-        finalize(resolve);
-      }
-    });
-  });
-};
+    promise.child = childRef;
+    promise.kill = (signal) => childRef && childRef.kill(signal);
+
+    return promise;
+  };
 
 module.exports = { runProcess };

package/src/cli/utils/transformer.js

@@ -51,13 +51,14 @@ const clearAllDevMode = (configPath) => {
   fs.writeFileSync(configPath, content);
 };
 
+const { createJiti } = require('jiti');
+
 const syncContextDownwards = (configObj) => {
   if (!fs.existsSync(configObj.path)) return;
   const configDir = path.dirname(configObj.path);
 
-  // Clear cache to read fresh state
-  delete require.cache[require.resolve(configObj.path)];
-  let configContent = require(configObj.path);
+  const jiti = createJiti(__filename);
+  let configContent = jiti(configObj.path);
   if (configContent.default) configContent = configContent.default;
 
   const exportData = {