@codemoreira/esad 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemoreira/esad",
-  "version": "1.3.1",
+  "version": "1.3.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",

package/src/cli/commands/deploy.js

@@ -1,39 +1,46 @@
 const fs = require('fs-extra');
 const path = require('path');
 const AdmZip = require('adm-zip');
+const chalk = require('chalk');
 const { getWorkspaceConfig } = require('../utils/config');
+const { resolveProjectDir, listAvailableModules } = require('../utils/resolution');
 
 module.exports = async (options) => {
   let cwd = process.cwd();
   let pkgPath = path.join(cwd, 'package.json');
   
-  // Try to find workspace config for root-level execution
+  // Enforce Workspace Root
   const configObj = getWorkspaceConfig();
-  if (configObj) {
-    const workspaceRoot = path.dirname(configObj.path);
-    const { projectName } = configObj.data;
-    
-    // If ID is provided, try to find that module/host folder
-    if (options.id) {
-       const targetDir = path.join(workspaceRoot, options.id);
-       if (fs.existsSync(targetDir)) {
-         cwd = targetDir;
-         pkgPath = path.join(cwd, 'package.json');
-         console.log(`📂 Auto-detected Project folder: ${path.relative(process.cwd(), targetDir)}`);
-       }
-    } else if (!fs.existsSync(pkgPath)) {
-       // If no ID and no package.json in current dir, assume we want to deploy the host from root
-       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 (!configObj) {
+    console.error(chalk.red(`❌ Erro: Comando deve ser executado na raiz do projeto (esad.config.json não encontrado).`));
+    process.exit(1);
+  }
+
+  const workspaceRoot = path.dirname(configObj.path);
+  const { projectName } = configObj.data;
+  
+  if (options.id) {
+    const targetDir = resolveProjectDir(options.id, configObj);
+    if (!targetDir) {
+      console.error(chalk.red(`\n❌ Erro: Não foi encontrado o módulo: ${options.id}`));
+      listAvailableModules(configObj);
+      process.exit(1);
+    }
+    cwd = targetDir;
+    pkgPath = path.join(cwd, 'package.json');
+    console.log(chalk.green(`📂 Módulo detectado para Deploy: ${path.relative(workspaceRoot, cwd)}`));
+  } else {
+    // Target host by default if in root
+    const hostDir = path.join(workspaceRoot, `${projectName}-host`);
+    if (fs.existsSync(hostDir)) {
+      cwd = hostDir;
+      pkgPath = path.join(cwd, 'package.json');
+      console.log(chalk.green(`📂 Host detectado para Deploy: ${path.relative(workspaceRoot, cwd)}`));
     }
   }
 
   if (!fs.existsSync(pkgPath)) {
-    console.error(`❌ Error: Call this command from inside a Project directory or the Workspace Root.`);
+    console.error(chalk.red(`❌ Erro: Arquivo package.json não encontrado em ${cwd}.`));
     process.exit(1);
   }
 

package/src/cli/commands/dev.js

@@ -2,34 +2,41 @@ const { spawn } = require('cross-spawn');
 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, listAvailableModules } = require('../utils/resolution');
 
 module.exports = async (options) => {
   let cwd = process.cwd();
   let pkgPath = path.join(cwd, 'package.json');
   
-  // Try to find workspace config for root-level execution
+  // Enforce Workspace Root
   const configObj = getWorkspaceConfig();
-  if (configObj) {
-    const workspaceRoot = path.dirname(configObj.path);
-    const { projectName } = configObj.data;
-    
-    if (options.id) {
-       // Target a specific module
-       const moduleDir = path.join(workspaceRoot, options.id);
-       if (fs.existsSync(moduleDir)) {
-         cwd = moduleDir;
-         pkgPath = path.join(cwd, 'package.json');
-         console.log(`📂 Auto-detected Module folder: ${path.relative(process.cwd(), moduleDir)}`);
-       }
-    } else {
-       // Target host by default if in root
-       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 (!configObj) {
+    console.error(chalk.red(`❌ Erro: Comando deve ser executado na raiz do projeto (esad.config.json não encontrado).`));
+    process.exit(1);
+  }
+
+  const workspaceRoot = path.dirname(configObj.path);
+  const { projectName } = configObj.data;
+  
+  if (options.id) {
+    const targetDir = resolveProjectDir(options.id, configObj);
+    if (!targetDir) {
+      console.error(chalk.red(`\n❌ Erro: Não foi encontrado o módulo: ${options.id}`));
+      listAvailableModules(configObj);
+      process.exit(1);
+    }
+    cwd = targetDir;
+    pkgPath = path.join(cwd, 'package.json');
+    console.log(chalk.green(`📂 Módulo detectado: ${path.relative(workspaceRoot, cwd)}`));
+  } else {
+    // Target host by default if in root
+    const hostDir = path.join(workspaceRoot, `${projectName}-host`);
+    if (fs.existsSync(hostDir)) {
+      cwd = hostDir;
+      pkgPath = path.join(cwd, 'package.json');
+      console.log(chalk.green(`📂 Host detectado: ${path.relative(workspaceRoot, cwd)}`));
     }
   }
 

package/src/cli/utils/resolution.js

@@ -0,0 +1,55 @@
+const fs = require('fs-extra');
+const path = require('path');
+const chalk = require('chalk');
+
+/**
+ * Resolves a project directory from a given ID, with support for prefixed names and auto-detection.
+ * @param {string} id The provided project ID
+ * @param {Object} configObj The workspace configuration object
+ * @returns {string|null} The absolute path to the project directory, or null if not found.
+ */
+function resolveProjectDir(id, configObj) {
+  if (!configObj) return null;
+  
+  const workspaceRoot = path.dirname(configObj.path);
+  const { projectName } = configObj.data;
+
+  // 1. Try exact match
+  let targetDir = path.join(workspaceRoot, id);
+  if (fs.existsSync(targetDir) && fs.statSync(targetDir).isDirectory()) {
+    return targetDir;
+  }
+
+  // 2. Try prefixed match (e.g., my-app-module-name)
+  targetDir = path.join(workspaceRoot, `${projectName}-${id}`);
+  if (fs.existsSync(targetDir) && fs.statSync(targetDir).isDirectory()) {
+    return targetDir;
+  }
+
+  return null;
+}
+
+/**
+ * Lists all available modules in the workspace, stripping the project prefix.
+ * @param {Object} configObj 
+ */
+function listAvailableModules(configObj) {
+  const workspaceRoot = path.dirname(configObj.path);
+  const { projectName } = configObj.data;
+  
+  const entries = fs.readdirSync(workspaceRoot, { withFileTypes: true });
+  const modules = entries
+    .filter(e => e.isDirectory() && e.name.startsWith(projectName))
+    .map(e => {
+      const name = e.name.replace(`${projectName}-`, '');
+      return name;
+    });
+
+  console.log(chalk.yellow('\nMódulos disponíveis:'));
+  modules.forEach(m => console.log(chalk.blue(`- ${m}`)));
+}
+
+module.exports = {
+  resolveProjectDir,
+  listAvailableModules
+};