@archznn/xavva 2.3.0 → 2.5.0

package/src/services/WatcherService.ts

@@ -9,6 +9,11 @@ export class WatcherService {
     private pendingFullBuild = false;
     private coolingFiles = new Set<string>();
     private debounceTimer?: Timer;
+    
+    // Rastreamento de arquivos modificados para build incremental inteligente
+    private modifiedFiles = new Set<string>();
+    private pendingFiles = new Set<string>(); // Arquivos modificados durante compilação
+    private hasPendingChanges = false;
 
     constructor(private config: AppConfig, private deployCmd: DeployCommand) {}
 
@@ -43,24 +48,57 @@ export class WatcherService {
             if (!isJava) return;
 
             Logger.watcher(filename, 'watch');
+            
+            // Se estiver compilando, acumula na fila de pendentes
+            if (this.isDeploying) {
+                this.pendingFiles.add(filename);
+                this.hasPendingChanges = true;
+                return;
+            }
+            
+            // Acumula arquivos modificados para o próximo build
+            this.modifiedFiles.add(filename);
+            
             clearTimeout(this.debounceTimer);
             
             this.debounceTimer = setTimeout(() => {
-                this.run(this.pendingFullBuild ? false : true);
+                const filesToCompile = [...this.modifiedFiles];
+                this.modifiedFiles.clear();
+                this.run(this.pendingFullBuild ? false : true, filesToCompile);
                 this.pendingFullBuild = false;
             }, WATCHER_DEBOUNCE_MS);
         });
     }
 
-    private async run(incremental = false) {
+    private async run(incremental = false, changedFiles?: string[]) {
         if (this.isDeploying) return;
         this.isDeploying = true;
+        
         try {
-            await this.deployCmd.execute(this.config, { watch: true, incremental });
+            // Passa os arquivos específicos que foram modificados
+            await this.deployCmd.execute(this.config, { 
+                watch: true, 
+                incremental,
+                changedFiles 
+            });
         } catch (e) {
             // Error handled by command
         } finally {
             this.isDeploying = false;
+            
+            // Se houve mudanças durante a compilação, processa imediatamente
+            if (this.hasPendingChanges) {
+                const pending = [...this.pendingFiles];
+                this.pendingFiles.clear();
+                this.hasPendingChanges = false;
+                
+                Logger.watcher(`Processing ${pending.length} pending change(s)...`, 'warn');
+                
+                // Pequeno delay para garantir que os arquivos foram salvos completamente
+                setTimeout(() => {
+                    this.run(true, pending);
+                }, 100);
+            }
         }
     }
 

package/src/types/config.ts

@@ -61,6 +61,7 @@ export interface CLIArguments {
     yes?: boolean;
     war?: boolean;
     cache?: boolean;
+    changedFiles?: string[];
 }
 
 export interface CommandContext {

package/src/utils/config.ts

@@ -79,7 +79,9 @@ export class ConfigManager {
         // Verificar se usar Tomcat embutido
         let tomcatPath = String(cliValues.path || xavvaJson.path || envTomcatPath || "");
         let useEmbedded = false;
-        let embeddedVersion = String(cliValues["tomcat-version"] || xavvaJson.version || "10.1.52");
+        // Versão pode vir de: CLI flag > xavva.json tomcat.version > xavva.json version (legado) > padrão
+        const xavvaTomcatVersion = (xavvaJson as any).tomcat?.version;
+        let embeddedVersion = String(cliValues["tomcat-version"] || xavvaTomcatVersion || xavvaJson.version || "10.1.52");
 
         // Se não há Tomcat configurado ou não existe no path, usar embutido
         if (!tomcatPath || (!fs.existsSync(path.join(tomcatPath, "bin", "catalina.bat")) && isStart)) {

package/src/utils/constants.ts

@@ -10,8 +10,8 @@ export const DEFAULT_DEBUG_PORT = 5005;
 
 // Timeouts (em milissegundos)
 export const TIMEOUT_SHUTDOWN_MS = 5000;
-export const WATCHER_DEBOUNCE_MS = 1000;
-export const WATCHER_COOLING_MS = 500;
+export const WATCHER_DEBOUNCE_MS = 1500;
+export const WATCHER_COOLING_MS = 1000;
 export const BROWSER_OPEN_DELAY_MS = 800;
 export const DEPLOY_HEALTH_CHECK_DELAY_MS = 1500;
 export const HOTSWAP_DELAY_MS = 500;