svger-cli 2.0.1 → 2.0.3

package/src/services/file-watcher.ts

@@ -1,218 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { FileWatchEvent, WatchOptions } from '../types/index.js';
-import { FileSystem } from '../utils/native.js';
-import { logger } from '../core/logger.js';
-
-/**
- * Professional file watching service with debouncing and event filtering
- */
-export class FileWatcherService {
-  private static instance: FileWatcherService;
-  private watchers: Map<string, fs.FSWatcher> = new Map();
-  private eventHandlers: Map<string, Function[]> = new Map();
-  private debounceTimers: Map<string, NodeJS.Timeout> = new Map();
-  private readonly debounceDelay = 300; // milliseconds
-
-  private constructor() {}
-
-  public static getInstance(): FileWatcherService {
-    if (!FileWatcherService.instance) {
-      FileWatcherService.instance = new FileWatcherService();
-    }
-    return FileWatcherService.instance;
-  }
-
-  /**
-   * Start watching a directory for SVG file changes
-   */
-  public async watchDirectory(
-    watchPath: string,
-    options: Partial<WatchOptions> = {}
-  ): Promise<string> {
-    const resolvedPath = path.resolve(watchPath);
-    
-    if (!(await FileSystem.exists(resolvedPath))) {
-      throw new Error(`Watch path does not exist: ${resolvedPath}`);
-    }
-
-    const watchId = `watch-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-    
-    try {
-      const watcher = fs.watch(resolvedPath, {
-        persistent: true,
-        recursive: false
-      }, (eventType, filename) => {
-        if (filename) {
-          this.handleFileEvent(watchId, eventType, path.join(resolvedPath, filename));
-        }
-      });
-
-      this.watchers.set(watchId, watcher);
-      this.eventHandlers.set(watchId, []);
-
-      logger.info(`Started watching directory: ${resolvedPath}`);
-      return watchId;
-
-    } catch (error) {
-      logger.error(`Failed to start watching ${resolvedPath}:`, error);
-      throw error;
-    }
-  }
-
-  /**
-   * Handle file system events with debouncing
-   */
-  private handleFileEvent(watchId: string, eventType: string, filePath: string): void {
-    // Only process SVG files
-    if (!filePath.endsWith('.svg')) {
-      return;
-    }
-
-    const debounceKey = `${watchId}-${filePath}`;
-    
-    // Clear existing timer
-    if (this.debounceTimers.has(debounceKey)) {
-      clearTimeout(this.debounceTimers.get(debounceKey)!);
-    }
-
-    // Set new timer
-    const timer = setTimeout(async () => {
-      this.debounceTimers.delete(debounceKey);
-      await this.processFileEvent(watchId, eventType, filePath);
-    }, this.debounceDelay);
-
-    this.debounceTimers.set(debounceKey, timer);
-  }
-
-  /**
-   * Process debounced file events
-   */
-  private async processFileEvent(watchId: string, eventType: string, filePath: string): Promise<void> {
-    try {
-      const exists = await FileSystem.exists(filePath);
-      let actualEventType: FileWatchEvent['type'];
-
-      // Determine actual event type
-      if (eventType === 'rename') {
-        actualEventType = exists ? 'add' : 'unlink';
-      } else {
-        actualEventType = 'change';
-      }
-
-      const event: FileWatchEvent = {
-        type: actualEventType,
-        filePath,
-        timestamp: Date.now()
-      };
-
-      logger.debug(`File event: ${actualEventType} - ${path.basename(filePath)}`);
-      
-      // Emit event to registered handlers
-      this.emitEvent(watchId, event);
-
-    } catch (error) {
-      logger.error(`Error processing file event for ${filePath}:`, error);
-    }
-  }
-
-  /**
-   * Register an event handler for a specific watcher
-   */
-  public onFileEvent(watchId: string, handler: (event: FileWatchEvent) => void | Promise<void>): void {
-    const handlers = this.eventHandlers.get(watchId) || [];
-    handlers.push(handler);
-    this.eventHandlers.set(watchId, handlers);
-  }
-
-  /**
-   * Emit event to all registered handlers
-   */
-  private emitEvent(watchId: string, event: FileWatchEvent): void {
-    const handlers = this.eventHandlers.get(watchId) || [];
-    
-    for (const handler of handlers) {
-      try {
-        const result = handler(event);
-        // Handle async handlers
-        if (result && typeof result.then === 'function') {
-          result.catch((error: any) => {
-            logger.error(`Error in file event handler:`, error);
-          });
-        }
-      } catch (error) {
-        logger.error(`Error in file event handler:`, error);
-      }
-    }
-  }
-
-  /**
-   * Stop watching a specific directory
-   */
-  public stopWatching(watchId: string): void {
-    const watcher = this.watchers.get(watchId);
-    if (watcher) {
-      watcher.close();
-      this.watchers.delete(watchId);
-      this.eventHandlers.delete(watchId);
-      
-      // Clear any pending debounce timers for this watcher
-      for (const [key, timer] of this.debounceTimers.entries()) {
-        if (key.startsWith(`${watchId}-`)) {
-          clearTimeout(timer);
-          this.debounceTimers.delete(key);
-        }
-      }
-      
-      logger.info(`Stopped watching: ${watchId}`);
-    }
-  }
-
-  /**
-   * Stop all watchers
-   */
-  public stopAllWatchers(): void {
-    for (const watchId of this.watchers.keys()) {
-      this.stopWatching(watchId);
-    }
-    logger.info('Stopped all file watchers');
-  }
-
-  /**
-   * Get active watch statistics
-   */
-  public getWatchStats(): {
-    activeWatchers: number;
-    pendingEvents: number;
-    totalHandlers: number;
-  } {
-    let totalHandlers = 0;
-    for (const handlers of this.eventHandlers.values()) {
-      totalHandlers += handlers.length;
-    }
-
-    return {
-      activeWatchers: this.watchers.size,
-      pendingEvents: this.debounceTimers.size,
-      totalHandlers
-    };
-  }
-
-  /**
-   * Cleanup on shutdown
-   */
-  public shutdown(): void {
-    this.stopAllWatchers();
-    
-    // Clear all debounce timers
-    for (const timer of this.debounceTimers.values()) {
-      clearTimeout(timer);
-    }
-    this.debounceTimers.clear();
-    
-    logger.info('File watcher service shutdown complete');
-  }
-}
-
-// Export singleton instance
-export const fileWatcher = FileWatcherService.getInstance();

package/src/services/svg-service.ts

@@ -1,468 +0,0 @@
-import path from 'path';
-import { FileSystem } from '../utils/native.js';
-import { BuildOptions, GenerateOptions, WatchOptions, FileWatchEvent } from '../types/index.js';
-import { logger } from '../core/logger.js';
-import { configService } from './config.js';
-import { svgProcessor } from '../processors/svg-processor.js';
-import { fileWatcher } from './file-watcher.js';
-
-/**
- * Main SVG service that orchestrates all SVG processing operations
- */
-export class SVGService {
-  private static instance: SVGService;
-  private activeWatchers: Set<string> = new Set();
-  public lockService: LockService;
-
-  private constructor() {
-    this.lockService = LockService.getInstance();
-  }
-
-  public static getInstance(): SVGService {
-    if (!SVGService.instance) {
-      SVGService.instance = new SVGService();
-    }
-    return SVGService.instance;
-  }
-
-  /**
-   * Build all SVG files from source to output directory
-   */
-  public async buildAll(options: BuildOptions): Promise<void> {
-    logger.info('Starting SVG build process');
-    logger.info(`Source: ${options.src}`);
-    logger.info(`Output: ${options.out}`);
-
-    const srcDir = path.resolve(options.src);
-    const outDir = path.resolve(options.out);
-
-    // Validate source directory
-    if (!(await FileSystem.exists(srcDir))) {
-      throw new Error(`Source folder not found: ${srcDir}`);
-    }
-
-    // Ensure output directory exists
-    await FileSystem.ensureDir(outDir);
-
-    // Get configuration - merge config file with options
-    const config = configService.readConfig();
-    const mergedConfig = { 
-      ...config, 
-      ...(options.config || {}),
-      // Support direct properties on options for CLI convenience
-      ...(options as any).framework && { framework: (options as any).framework },
-      ...(options as any).typescript !== undefined && { typescript: (options as any).typescript },
-      ...(options as any).frameworkOptions && { frameworkOptions: (options as any).frameworkOptions }
-    };
-
-    // Read all SVG files
-    const files = await FileSystem.readDir(srcDir);
-    const svgFiles = files.filter((file: string) => file.endsWith('.svg'));
-
-    if (svgFiles.length === 0) {
-      logger.warn('No SVG files found in source directory');
-      return;
-    }
-
-    logger.info(`Found ${svgFiles.length} SVG files to process`);
-
-    const results: Array<{ success: boolean; file: string; error?: Error }> = [];
-
-    // Process each SVG file
-    for (const file of svgFiles) {
-      const svgPath = path.join(srcDir, file);
-
-      // Check if file is locked
-      if (this.lockService.isLocked(svgPath)) {
-        logger.warn(`Skipped locked file: ${file}`);
-        continue;
-      }
-
-      try {
-        const processingResult = await svgProcessor.processSVGFile(svgPath, outDir, {
-          framework: mergedConfig.framework,
-          typescript: mergedConfig.typescript,
-          frameworkOptions: mergedConfig.frameworkOptions,
-          defaultWidth: mergedConfig.defaultWidth,
-          defaultHeight: mergedConfig.defaultHeight,
-          defaultFill: mergedConfig.defaultFill,
-          styleRules: Object.fromEntries(
-            Object.entries(mergedConfig.styleRules || {}).filter(([_, v]) => v !== undefined)
-          ) as Record<string, string>
-        });
-
-        results.push({
-          success: processingResult.success,
-          file,
-          error: processingResult.error
-        });
-
-      } catch (error) {
-        logger.error(`Failed to process ${file}:`, error);
-        results.push({
-          success: false,
-          file,
-          error: error as Error
-        });
-      }
-    }
-
-    // Log summary
-    const successful = results.filter(r => r.success).length;
-    const failed = results.filter(r => !r.success).length;
-
-    logger.info(`Build complete: ${successful} successful, ${failed} failed`);
-
-    if (failed > 0) {
-      logger.warn('Some files failed to process:');
-      results.filter(r => !r.success).forEach(r => {
-        logger.warn(`  - ${r.file}: ${r.error?.message}`);
-      });
-    }
-
-    // Generate index.ts file with all component exports
-    if (successful > 0) {
-      await this.generateIndexFile(outDir, results.filter(r => r.success).map(r => r.file));
-    }
-  }
-
-  /**
-   * Generate a React component from a single SVG file
-   */
-  public async generateSingle(options: GenerateOptions): Promise<void> {
-    logger.info(`Generating component from: ${options.svgFile}`);
-
-    const filePath = path.resolve(options.svgFile);
-    const outDir = path.resolve(options.outDir);
-
-    // Validate SVG file
-    if (!(await FileSystem.exists(filePath))) {
-      throw new Error(`SVG file not found: ${filePath}`);
-    }
-
-    // Check if file is locked
-    if (this.lockService.isLocked(filePath)) {
-      logger.warn(`File is locked: ${path.basename(options.svgFile)}`);
-      return;
-    }
-
-    // Get configuration
-    const config = configService.readConfig();
-    const mergedConfig = { ...config, ...options.config };
-
-    // Process the file
-    const result = await svgProcessor.processSVGFile(filePath, outDir, {
-      defaultWidth: mergedConfig.defaultWidth,
-      defaultHeight: mergedConfig.defaultHeight,
-      defaultFill: mergedConfig.defaultFill,
-      styleRules: Object.fromEntries(
-        Object.entries(mergedConfig.styleRules || {}).filter(([_, v]) => v !== undefined)
-      ) as Record<string, string>
-    });
-
-    if (!result.success) {
-      throw result.error || new Error('Failed to generate component');
-    }
-
-    logger.success(`Component generated: ${result.componentName}`);
-  }
-
-  /**
-   * Start watching SVG files for changes
-   */
-  public async startWatching(options: WatchOptions): Promise<string> {
-    logger.info('Starting watch mode');
-    logger.info(`Watching: ${options.src}`);
-    logger.info(`Output: ${options.out}`);
-
-    const srcDir = path.resolve(options.src);
-    const outDir = path.resolve(options.out);
-
-    // Validate source directory
-    if (!(await FileSystem.exists(srcDir))) {
-      throw new Error(`Source folder not found: ${srcDir}`);
-    }
-
-    // Start watching
-    const watchId = await fileWatcher.watchDirectory(srcDir, options);
-    this.activeWatchers.add(watchId);
-
-    // Register event handler
-    fileWatcher.onFileEvent(watchId, async (event: FileWatchEvent) => {
-      await this.handleWatchEvent(event, outDir, options.config);
-    });
-
-    logger.success(`Watch mode active - waiting for file changes...`);
-    return watchId;
-  }
-
-  /**
-   * Handle file watch events
-   */
-  private async handleWatchEvent(
-    event: FileWatchEvent, 
-    outDir: string,
-    config?: Partial<any>
-  ): Promise<void> {
-    const fileName = path.basename(event.filePath);
-    
-    switch (event.type) {
-      case 'add':
-        logger.info(`New SVG detected: ${fileName}`);
-        await this.processWatchedFile(event.filePath, outDir, config);
-        break;
-        
-      case 'change':
-        logger.info(`SVG updated: ${fileName}`);
-        await this.processWatchedFile(event.filePath, outDir, config);
-        break;
-        
-      case 'unlink':
-        logger.info(`SVG removed: ${fileName}`);
-        await this.handleFileRemoval(event.filePath, outDir);
-        break;
-    }
-  }
-
-  /**
-   * Process a watched file
-   */
-  private async processWatchedFile(
-    filePath: string,
-    outDir: string,
-    config?: Partial<any>
-  ): Promise<void> {
-    try {
-      // Check if file is locked
-      if (this.lockService.isLocked(filePath)) {
-        logger.warn(`Skipped locked file: ${path.basename(filePath)}`);
-        return;
-      }
-
-      // Get configuration
-      const fullConfig = configService.readConfig();
-      const mergedConfig = { ...fullConfig, ...config };
-
-      // Process the file
-      await svgProcessor.processSVGFile(filePath, outDir, {
-        defaultWidth: mergedConfig.defaultWidth,
-        defaultHeight: mergedConfig.defaultHeight,
-        defaultFill: mergedConfig.defaultFill,
-        styleRules: Object.fromEntries(
-          Object.entries(mergedConfig.styleRules || {}).filter(([_, v]) => v !== undefined)
-        ) as Record<string, string>
-      });
-
-    } catch (error) {
-      logger.error(`Failed to process watched file ${path.basename(filePath)}:`, error);
-    }
-  }
-
-  /**
-   * Handle file removal in watch mode
-   */
-  private async handleFileRemoval(filePath: string, outDir: string): Promise<void> {
-    try {
-      const componentName = svgProcessor.generateComponentName(path.basename(filePath));
-      const componentPath = path.join(outDir, `${componentName}.tsx`);
-
-      if (await FileSystem.exists(componentPath)) {
-        await FileSystem.unlink(componentPath);
-        logger.success(`Removed component: ${componentName}.tsx`);
-      }
-    } catch (error) {
-      logger.error(`Failed to remove component for ${path.basename(filePath)}:`, error);
-    }
-  }
-
-  /**
-   * Stop watching files
-   */
-  public stopWatching(watchId?: string): void {
-    if (watchId) {
-      fileWatcher.stopWatching(watchId);
-      this.activeWatchers.delete(watchId);
-    } else {
-      // Stop all watchers
-      for (const id of this.activeWatchers) {
-        fileWatcher.stopWatching(id);
-      }
-      this.activeWatchers.clear();
-    }
-  }
-
-  /**
-   * Clean output directory
-   */
-  public async clean(outDir: string): Promise<void> {
-    const targetDir = path.resolve(outDir);
-
-    if (!(await FileSystem.exists(targetDir))) {
-      logger.warn(`Directory not found: ${targetDir}`);
-      return;
-    }
-
-    await FileSystem.emptyDir(targetDir);
-    logger.success(`Cleaned all generated SVG components in: ${targetDir}`);
-  }
-
-  /**
-   * Generate index.ts file with all component exports
-   */
-  private async generateIndexFile(outDir: string, svgFiles: string[]): Promise<void> {
-    try {
-      const componentNames = svgFiles.map(file => {
-        const baseName = path.basename(file, '.svg');
-        return svgProcessor.generateComponentName(baseName);
-      });
-
-      const indexContent = this.generateIndexContent(componentNames);
-      const indexPath = path.join(outDir, 'index.ts');
-      
-      await FileSystem.writeFile(indexPath, indexContent, 'utf-8');
-      logger.success(`Generated index.ts with ${componentNames.length} component exports`);
-    } catch (error) {
-      logger.error('Failed to generate index.ts:', error);
-    }
-  }
-
-  /**
-   * Generate the content for index.ts file
-   */
-  private generateIndexContent(componentNames: string[]): string {
-    const imports = componentNames.map(name => `export { default as ${name} } from './${name}';`).join('\n');
-    
-    const exportAll = `
-// Export all components
-export {
-${componentNames.map(name => `  ${name},`).join('\n')}
-};
-
-// Re-export for convenience
-export default {
-${componentNames.map(name => `  ${name},`).join('\n')}
-};
-`;
-
-    return `/**
- * SVG Components Index
- * Generated by svger-cli
- * 
- * Import individual components:
- * import { ${componentNames[0] || 'ComponentName'} } from './components';
- * 
- * Import all components:
- * import * as Icons from './components';
- * import Icons from './components'; // default export
- */
-
-${imports}${exportAll}`;
-  }
-
-  /**
-   * Get service statistics
-   */
-  public getStats(): {
-    activeWatchers: number;
-    processingQueue: any;
-    watcherStats: any;
-  } {
-    return {
-      activeWatchers: this.activeWatchers.size,
-      processingQueue: svgProcessor.getProcessingStats(),
-      watcherStats: fileWatcher.getWatchStats()
-    };
-  }
-
-  /**
-   * Shutdown service
-   */
-  public shutdown(): void {
-    this.stopWatching();
-    fileWatcher.shutdown();
-    svgProcessor.clearQueue();
-    logger.info('SVG service shutdown complete');
-  }
-}
-
-/**
- * Simple file locking service
- */
-export class LockService {
-  private static instance: LockService;
-  private static readonly LOCK_FILE = '.svg-lock';
-  private cachedLocks: Set<string> | null = null;
-
-  private constructor() {}
-
-  public static getInstance(): LockService {
-    if (!LockService.instance) {
-      LockService.instance = new LockService();
-    }
-    return LockService.instance;
-  }
-
-  private getLockFilePath(): string {
-    return path.resolve(LockService.LOCK_FILE);
-  }
-
-  private readLockFile(): Set<string> {
-    if (this.cachedLocks) {
-      return this.cachedLocks;
-    }
-
-    try {
-      const data = FileSystem.readJSONSync(this.getLockFilePath());
-      this.cachedLocks = new Set(Array.isArray(data) ? data : []);
-      return this.cachedLocks;
-    } catch {
-      this.cachedLocks = new Set();
-      return this.cachedLocks;
-    }
-  }
-
-  private writeLockFile(locks: Set<string>): void {
-    try {
-      FileSystem.writeJSONSync(this.getLockFilePath(), Array.from(locks), { spaces: 2 });
-      this.cachedLocks = locks;
-    } catch (error) {
-      logger.error('Failed to write lock file:', error);
-    }
-  }
-
-  public lockFiles(files: string[]): void {
-    const fileNames = files.map(f => path.basename(f));
-    const current = this.readLockFile();
-    
-    for (const fileName of fileNames) {
-      current.add(fileName);
-    }
-    
-    this.writeLockFile(current);
-    logger.success(`Locked files: ${fileNames.join(', ')}`);
-  }
-
-  public unlockFiles(files: string[]): void {
-    const fileNames = files.map(f => path.basename(f));
-    const current = this.readLockFile();
-    
-    for (const fileName of fileNames) {
-      current.delete(fileName);
-    }
-    
-    this.writeLockFile(current);
-    logger.success(`Unlocked files: ${fileNames.join(', ')}`);
-  }
-
-  public isLocked(file: string): boolean {
-    const locks = this.readLockFile();
-    return locks.has(path.basename(file));
-  }
-
-  public clearCache(): void {
-    this.cachedLocks = null;
-  }
-}
-
-// Export singleton instance
-export const svgService = SVGService.getInstance();