xatriumcss 1.0.13 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xatriumcss",
-    "version": "1.0.13",
+    "version": "1.0.15",
     "description": "Ultra-fast utility-first CSS framework",
     "main": "./src/index.js",
     "files": [

package/src/cli.js

@@ -12,10 +12,10 @@ function parseArgs(argv) {
         '--output': null,
         '--watch': false
     };
-    
+
     for (let i = 0; i < argv.length; i++) {
         const arg = argv[i];
-        
+
         if (arg === '--watch' || arg === '-w') {
             args['--watch'] = true;
         } else if (arg === '--input' || arg === '-i') {
@@ -24,7 +24,7 @@ function parseArgs(argv) {
             args['--output'] = argv[++i];
         }
     }
-    
+
     return args;
 }
 
@@ -44,12 +44,12 @@ config.output = path.resolve(projectRoot, config.output);
 
 function build() {
     const startTime = process.hrtime.bigint();
-    
+
     console.log('🔍 Checking for @import "xatriumcss"...');
-    
+
     // Check if input CSS has the import
     const hasImport = hasXatriumImport(config.input);
-    
+
     if (!hasImport) {
         console.log('⚠️  No @import "xatriumcss" found - writing empty CSS');
         const outputDir = path.dirname(config.output);
@@ -57,24 +57,24 @@ function build() {
             fs.mkdirSync(outputDir, { recursive: true });
         }
         fs.writeFileSync(config.output, '', 'utf-8');
-        
+
         const endTime = process.hrtime.bigint();
         const duration = endTime - startTime;
         console.log(`✅ Done in ${formatTime(duration)}`);
         return;
     }
-    
+
     runParser(config);
-    
+
     const endTime = process.hrtime.bigint();
     const duration = endTime - startTime;
-    
+
     console.log(`✅ Done in ${formatTime(duration)}`);
 }
 
 function formatTime(nanoseconds) {
     const ms = Number(nanoseconds) / 1_000_000;
-    
+
     if (ms < 1000) return `${Math.round(ms)}ms`;
     return `${(ms / 1000).toFixed(2)}s`;
 }
@@ -89,96 +89,119 @@ function formatTime(nanoseconds) {
         process.exit(1);
     }
 
+    // Watch mode
     // Watch mode
     if (args['--watch']) {
         console.log('\n👀 Watch mode enabled\n');
         console.log('\n👀 Watching for changes...\n');
-        
+
         const changedFiles = new Set();
         let rebuildTimer = null;
-        
+        let isBuilding = false;  // ← ADD THIS FLAG
+
         function scheduleRebuild() {
-            if (rebuildTimer) return;
-            
+            if (rebuildTimer || isBuilding) return;  // ← Check if building
+
             rebuildTimer = setTimeout(() => {
                 const files = Array.from(changedFiles);
                 changedFiles.clear();
                 rebuildTimer = null;
-                
+
+                isBuilding = true;  // ← Set flag
                 try {
                     build();
                 } catch (error) {
                     console.error('❌ Build error:', error.message);
+                } finally {
+                    isBuilding = false;  // ← Clear flag
                 }
-            }, 10);
+            }, 100);  // ← Increase to 100ms
         }
-        
+
         // Get directories to watch
         const watchDirs = new Set();
         const contentPatterns = Array.isArray(config.content) ? config.content : [config.content];
-        
+
+        // Normalize output path for comparison
+        const normalizedOutput = path.normalize(config.output).toLowerCase();
+
         for (const pattern of contentPatterns) {
             const baseDir = pattern.split('**')[0].replace(/\*/g, '');
             const resolvedDir = path.resolve(projectRoot, baseDir || '.');
-            
+
             if (fs.existsSync(resolvedDir)) {
                 watchDirs.add(resolvedDir);
             }
         }
-        
+
         // IMPORTANT: Watch the input CSS directory
         const inputDir = path.dirname(config.input);
         if (fs.existsSync(inputDir)) {
             watchDirs.add(inputDir);
         }
-        
+
+        console.log('👁️  Watching directories:', Array.from(watchDirs));
+
         // Subscribe to file changes
         const subscriptions = [];
-        
+
         for (const dir of watchDirs) {
             const subscription = await watcher.subscribe(dir, (err, events) => {
                 if (err) {
                     console.error('❌ Watcher error:', err);
                     return;
                 }
-                
+
                 for (const event of events) {
                     if (event.type === 'delete') continue;
 
+                    // Normalize paths for comparison
+                    const normalizedPath = path.normalize(event.path).toLowerCase();
+
                     // CRITICAL: Ignore output file to prevent infinite loop
-                    if (path.resolve(event.path) === path.resolve(config.output)) {
+                    if (normalizedPath === normalizedOutput) {
+                        console.log('🚫 Ignoring output file change');
                         continue;
                     }
-                    
+
+                    // Also ignore the entire output directory
+                    if (normalizedPath.startsWith(path.dirname(normalizedOutput).toLowerCase())) {
+                        const isOutputDir = path.dirname(normalizedPath) === path.dirname(normalizedOutput).toLowerCase();
+                        if (isOutputDir) {
+                            console.log('🚫 Ignoring output directory change');
+                            continue;
+                        }
+                    }
+
                     const ext = path.extname(event.path);
-                    const isInputFile = path.resolve(event.path) === path.resolve(config.input);
-                    
+                    const isInputFile = path.normalize(event.path).toLowerCase() === path.normalize(config.input).toLowerCase();
+
                     // Watch input CSS and content files
                     if (isInputFile || ['.html', '.jsx', '.js', '.ts', '.tsx', '.vue', '.css'].includes(ext)) {
                         changedFiles.add(event.path);
                         console.log('📝 Changed:', path.relative(projectRoot, event.path));
                     }
                 }
-                
+
                 if (changedFiles.size > 0) {
                     scheduleRebuild();
                 }
             });
-            
+
             subscriptions.push(subscription);
         }
-        
+
         // Cleanup on exit
         process.on('SIGINT', async () => {
             console.log('\n\n👋 Shutting down...');
-            
+
             for (const sub of subscriptions) {
                 await sub.unsubscribe();
             }
-            
+
             process.exit(0);
         });
-        
+
         process.stdin.resume();
     }
 })();