samre-cli 1.0.3 → 1.0.5

package/package.json

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

package/src/templates/flutter_sdk.js

@@ -79,38 +79,40 @@ class _SamreOverlayState extends State<SamreOverlay> {
         children: [
           widget.child,
 
-          // ── Bouton Flottant en Bas à Droite ──────────────────────────────
+          // ── Bouton Flottant Rehaussé avec SafeArea (Au-dessus des barres de navigation) ──
           Positioned(
-            bottom: 24,
-            right: 20,
-            child: Material(
-              elevation: 8,
-              borderRadius: BorderRadius.circular(24),
-              color: _canSubmit ? const Color(0xFF2563EB) : Colors.black.withOpacity(0.75),
-              child: InkWell(
+            bottom: 48,
+            right: 18,
+            child: SafeArea(
+              child: Material(
+                elevation: 10,
                 borderRadius: BorderRadius.circular(24),
-                onTap: _canSubmit ? _openDialog : null,
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Icon(
-                        _canSubmit ? Icons.verified_user : Icons.timer_outlined,
-                        color: Colors.white,
-                        size: 18,
-                      ),
-                      const SizedBox(width: 8),
-                      Text(
-                        _canSubmit ? 'Valider Journée' : 'Test en cours (\${_secondsRemaining}s)',
-                        style: const TextStyle(
+                color: _canSubmit ? const Color(0xFF2563EB) : Colors.black.withOpacity(0.85),
+                child: InkWell(
+                  borderRadius: BorderRadius.circular(24),
+                  onTap: _canSubmit ? _openDialog : null,
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Icon(
+                          _canSubmit ? Icons.verified_user : Icons.timer_outlined,
                           color: Colors.white,
-                          fontWeight: FontWeight.bold,
-                          fontSize: 12,
-                          decoration: TextDecoration.none,
+                          size: 18,
                         ),
-                      ),
-                    ],
+                        const SizedBox(width: 8),
+                        Text(
+                          _canSubmit ? 'Valider Journée' : 'Test en cours (\${_secondsRemaining}s)',
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontWeight: FontWeight.bold,
+                            fontSize: 12,
+                            decoration: TextDecoration.none,
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
                 ),
               ),

package/src/utils/flutter.js

@@ -54,6 +54,24 @@ export const FlutterUtil = {
     return sdkPath;
   },
 
+  cleanMainDartContent(rawContent) {
+    let content = rawContent;
+
+    // 1. Supprimer l'import du SDK Samré
+    content = content.replace(/import\s+['"]samre_sdk\.dart['"];\s*\n?/g, '');
+    content = content.replace(/\/\/\s*SDK Samré\s*\n?/gi, '');
+    content = content.replace(/\/\/\s*👉\s*SamreOverlay[^\n]*\n?/gi, '');
+
+    // 2. Supprimer la propriété builder SamreOverlay dans MaterialApp
+    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(/builder\s*:\s*\([^)]*\)\s*=>\s*SamreOverlay\s*\(\s*child\s*:\s*([^)]+)\),?\s*\n?/g, 'builder: (context, child) => $1,\n');
+
+    // 3. Déballer SamreOverlay s'il entoure un widget (ex: home: SamreOverlay(child: SplashPage()))
+    content = content.replace(/SamreOverlay\s*\(\s*child\s*:\s*([^)]+)\)/g, '$1');
+
+    return content;
+  },
+
   injectIntoMain(cwd = process.cwd()) {
     const mainPath = path.join(cwd, 'lib', 'main.dart');
     const backupPath = path.join(cwd, 'lib', 'main.dart.samre_bak');
@@ -62,50 +80,45 @@ export const FlutterUtil = {
       return { injected: false, reason: 'main.dart introuvable' };
     }
 
-    const content = fs.readFileSync(mainPath, 'utf-8');
+    const originalContent = fs.readFileSync(mainPath, 'utf-8');
 
-    // Sauvegarde de secours si pas encore existante
-    if (!fs.existsSync(backupPath)) {
-      fs.writeFileSync(backupPath, content, 'utf-8');
-    }
+    // Nettoyer d'abord tout résidu ou ancienne injection
+    let cleanContent = this.cleanMainDartContent(originalContent);
 
-    // Si déjà injecté
-    if (content.includes('SamreOverlay') || content.includes('samre_sdk.dart')) {
-      return { injected: true, alreadyInjected: true, backupPath };
+    // Sauvegarde de secours du fichier propre
+    if (!fs.existsSync(backupPath)) {
+      fs.writeFileSync(backupPath, cleanContent, 'utf-8');
     }
 
-    let modified = content;
+    let modified = cleanContent;
 
-    // 1. Ajouter l'import en haut
-    const importStatement = "import 'package:flutter/material.dart';\nimport 'samre_sdk.dart';\n";
+    // 1. Ajouter l'import de samre_sdk en haut (sans dupliquer)
     if (!modified.includes('samre_sdk.dart')) {
-      modified = importStatement + modified;
+      modified = "import 'samre_sdk.dart';\n" + modified;
     }
 
-    // 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
+    // 2. Injecter proprement dans builder de MaterialApp
+    if (modified.includes('MaterialApp(')) {
+      // Si MaterialApp a déjà une propriété builder existante
       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 };
+      } else {
+        // Sinon insérer builder: (context, child) => SamreOverlay(...)
+        modified = modified.replace(
+          /MaterialApp\s*\(/,
+          'MaterialApp(\n      builder: (context, child) => SamreOverlay(child: child ?? const SizedBox()),'
+        );
       }
-
-      // 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')) {
+    if (homeRegex.test(modified)) {
       modified = modified.replace(homeRegex, (match, p1) => {
         return `home: SamreOverlay(child: ${p1.trim()})`;
       });
@@ -126,22 +139,30 @@ export const FlutterUtil = {
     let sdkDeleted = false;
     let mainRestored = false;
 
+    // 1. Supprimer le fichier SDK
     if (fs.existsSync(sdkPath)) {
       fs.unlinkSync(sdkPath);
       sdkDeleted = true;
     }
 
+    // 2. Si un backup existe, essayer de le restaurer
     if (fs.existsSync(backupPath)) {
-      fs.copyFileSync(backupPath, mainPath);
-      fs.unlinkSync(backupPath);
-      mainRestored = true;
-    } else if (fs.existsSync(mainPath)) {
-      // 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');
+      try {
+        const backupContent = fs.readFileSync(backupPath, 'utf-8');
+        const cleanBackup = this.cleanMainDartContent(backupContent);
+        fs.writeFileSync(mainPath, cleanBackup, 'utf-8');
+        fs.unlinkSync(backupPath);
+        mainRestored = true;
+      } catch {
+        // Fallback nettoyage direct
+      }
+    }
+
+    // 3. Dans tous les cas, s'assurer que main.dart est 100% purgé de toute trace de Samré
+    if (fs.existsSync(mainPath)) {
+      const currentContent = fs.readFileSync(mainPath, 'utf-8');
+      const cleanContent = this.cleanMainDartContent(currentContent);
+      fs.writeFileSync(mainPath, cleanContent, 'utf-8');
       mainRestored = true;
     }