fleetbo-cockpit-cli 1.0.93 → 1.0.95

package/cli.js

@@ -99,9 +99,9 @@ const checkGitSecurity = () => {
 const injectRouteIntoAppJs = (moduleName, subPath = '') => {
     const appJsPath = fs.existsSync(path.join(process.cwd(), 'src', 'App.jsx'))
     ? path.join(process.cwd(), 'src', 'App.jsx')
-    : path.join(process.cwd(), 'src', 'App.js');
+    : path.join(process.cwd(), 'src', 'App.jsx');
     if (!fs.existsSync(appJsPath)) {
-        console.error(`   \x1b[31m[Safety Stop]\x1b[0m App.js missing.`);
+        console.error(`   \x1b[31m[Safety Stop]\x1b[0m App.jsx missing.`);
         return false;
     }
 
@@ -110,7 +110,7 @@ const injectRouteIntoAppJs = (moduleName, subPath = '') => {
     const routeAnchor = '{/* FLEETBO_DYNAMIC ROUTES */}';
 
     if (!content.includes(importAnchor) || !content.includes(routeAnchor)) {
-        console.log(`   \x1b[33m[Skipped]\x1b[0m Anchors missing in App.js. Manual injection required.`);
+        console.log(`   \x1b[33m[Skipped]\x1b[0m Anchors missing in App.jsx. Manual injection required.`);
         return false;
     }
 
@@ -120,14 +120,22 @@ const injectRouteIntoAppJs = (moduleName, subPath = '') => {
 
     let modified = false;
 
+    // 1. Injection de l'import (Capture l'indentation d'origine)
     if (!content.includes(importLine)) {
-        content = content.replace(importAnchor, `${importLine}\n${importAnchor}`);
+        const importMatch = content.match(new RegExp(`(\\n[ \\t]*)${importAnchor.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`));
+        const importIndent = importMatch ? importMatch[1] : '\n';
+        content = content.replace(importAnchor, `${importLine}${importIndent}${importAnchor}`);
         modified = true;
     }
+    
+    // 2. Injection de la route (Capture l'indentation d'origine, fini les espaces en dur !)
     if (!content.includes(routeLine)) {
-        content = content.replace(routeAnchor, `${routeLine}\n            ${routeAnchor}`);
+        const routeMatch = content.match(new RegExp(`(\\n[ \\t]*)${routeAnchor.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`));
+        const routeIndent = routeMatch ? routeMatch[1] : '\n';
+        content = content.replace(routeAnchor, `${routeLine}${routeIndent}${routeAnchor}`);
         modified = true;
     }
+    
     if (modified) {
         fs.writeFileSync(appJsPath, content);
     }
@@ -202,24 +210,27 @@ const getModuleCache = async ({ projectId, moduleName }) => {
 const removeRouteFromAppJs = (moduleName) => {
     const appJsPath = fs.existsSync(path.join(process.cwd(), 'src', 'App.jsx'))
     ? path.join(process.cwd(), 'src', 'App.jsx')
-    : path.join(process.cwd(), 'src', 'App.js');
+    : path.join(process.cwd(), 'src', 'App.jsx');
     if (!fs.existsSync(appJsPath)) return false;
 
     let content = fs.readFileSync(appJsPath, 'utf8');
     
-    // Pattern exact pour l'import et la route (gestion du sous-dossier mocks/)
     const importLine = `import ${moduleName} from './app/mocks/${moduleName}';`;
     const routeLine = `<Route path="/mocks/${moduleName.toLowerCase()}" element={<${moduleName} />} />`;
 
     const originalContent = content;
     
-    // On retire les lignes si elles existent (avec le retour à la ligne)
-    content = content.replace(new RegExp(`${importLine.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g'), '');
-    content = content.replace(new RegExp(`\\s*${routeLine.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g'), '');
+    // On supprime l'import ET le saut de ligne qui le suit
+    const importRegex = new RegExp(`${importLine.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g');
+    content = content.replace(importRegex, '');
+
+    // On supprime la route ET tous les espaces/sauts de ligne qui la PRÉCÈDENT
+    const routeRegex = new RegExp(`\\n?\\s*${routeLine.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`, 'g');
+    content = content.replace(routeRegex, '');
 
     if (content !== originalContent) {
         fs.writeFileSync(appJsPath, content);
-        console.log(`   \x1b[32m[Unrouted]\x1b[0m ${moduleName} removed from App.js.`);
+        console.log(`   \x1b[32m[Unrouted]\x1b[0m ${moduleName} removed from App.jsx.`);
         return true;
     }
     return false;
@@ -477,13 +488,13 @@ if (command === 'alex') {
     };
     
     // ============================================================
-// CLI PATCH — startAlexSession (cli.js)
-// 
-// Remplace le bloc ENTIER de startAlexSession, depuis :
-//   const startAlexSession = async () => {
-// Jusqu'à (NON INCLUS) :
-//   const rl = readline.createInterface({
-// ============================================================
+    // CLI PATCH — startAlexSession (cli.js)
+    // 
+    // Remplace le bloc ENTIER de startAlexSession, depuis :
+    //   const startAlexSession = async () => {
+    // Jusqu'à (NON INCLUS) :
+    //   const rl = readline.createInterface({
+    // ============================================================
 
     const startAlexSession = async () => {
         process.stdout.write('\x1b[33m🛡️  Alex is checking runtime state...\x1b[0m\r');
@@ -690,7 +701,7 @@ else if (command === 'rm') {
         actionsDone++;
     }
 
-    // 4. Disinfect System Core (App.js)
+    // 4. Disinfect System Core (App.jsx)
     const unrouted = removeRouteFromAppJs(moduleName);
     if (unrouted) actionsDone++;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetbo-cockpit-cli",
-  "version": "1.0.93",
+  "version": "1.0.95",
   "description": "Fleetbo CLI - Build native mobile apps with React",
   "author": "Fleetbo",
   "license": "MIT",