samre-cli 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "samre-cli",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "CLI officiel d'injection automatique du SDK Samré dans les applications mobiles (Flutter, React Native)",
   "main": "bin/samre.js",
   "bin": {

package/src/utils/flutter.js

@@ -82,8 +82,28 @@ export const FlutterUtil = {
       modified = importStatement + modified;
     }
 
-    // 2. Tenter d'envelopper builder ou home dans MaterialApp
-    // Exemple de pattern courant : home: QuelqueChose() -> home: SamreOverlay(child: QuelqueChose())
+    // 2. Tenter d'injecter dans builder de MaterialApp (Idéal pour tous les écrans et le routage)
+    if (modified.includes('MaterialApp(') && !modified.includes('SamreOverlay')) {
+      // Si MaterialApp a déjà une propriété builder
+      const builderRegex = /builder\s*:\s*\(([^)]*)\)\s*=>\s*([^,\n;]+)/;
+      if (builderRegex.test(modified)) {
+        modified = modified.replace(builderRegex, (match, args, body) => {
+          return `builder: (${args}) => SamreOverlay(child: ${body.trim()})`;
+        });
+        fs.writeFileSync(mainPath, modified, 'utf-8');
+        return { injected: true, modifiedBuilder: true, backupPath };
+      }
+
+      // Sinon insérer la propriété builder juste après MaterialApp(
+      modified = modified.replace(
+        /MaterialApp\s*\(/,
+        'MaterialApp(\n      builder: (context, child) => SamreOverlay(child: child ?? const SizedBox()),'
+      );
+      fs.writeFileSync(mainPath, modified, 'utf-8');
+      return { injected: true, modifiedBuilder: true, backupPath };
+    }
+
+    // Fallback : injection sur home:
     const homeRegex = /home\s*:\s*([^,\n\);]+)/;
     if (homeRegex.test(modified) && !modified.includes('SamreOverlay')) {
       modified = modified.replace(homeRegex, (match, p1) => {
@@ -93,8 +113,6 @@ export const FlutterUtil = {
       return { injected: true, modifiedHome: true, backupPath };
     }
 
-    // Si injection automatique du widget home n'a pas pu matcher le pattern exact,
-    // on sauvegarde le fichier avec l'import et on informe le dev
     fs.writeFileSync(mainPath, modified, 'utf-8');
     return { injected: false, importAdded: true, backupPath };
   },
@@ -121,6 +139,7 @@ export const FlutterUtil = {
       // Nettoyage manuel si pas de backup
       let content = fs.readFileSync(mainPath, 'utf-8');
       content = content.replace(/import\s+['"]samre_sdk\.dart['"];\s*\n?/g, '');
+      content = content.replace(/builder\s*:\s*\([^)]*\)\s*=>\s*SamreOverlay\s*\(\s*child\s*:\s*child\s*\?\?\s*const\s*SizedBox\(\)\s*\),?\s*\n?/g, '');
       content = content.replace(/SamreOverlay\s*\(\s*child\s*:\s*([^)]+)\)/g, '$1');
       fs.writeFileSync(mainPath, content, 'utf-8');
       mainRestored = true;