@git.zone/cli 1.16.6 → 1.16.8

package/ts/mod_format/classes.dependency-analyzer.ts

@@ -9,35 +9,42 @@ export interface IModuleDependency {
 
 export class DependencyAnalyzer {
   private moduleDependencies: Map<string, IModuleDependency> = new Map();
-  
+
   constructor() {
     this.initializeDependencies();
   }
-  
+
   private initializeDependencies(): void {
     // Define dependencies between format modules
     const dependencies = {
-      'cleanup': [],  // No dependencies
-      'npmextra': [],  // No dependencies
-      'license': ['npmextra'],  // Depends on npmextra for config
-      'packagejson': ['npmextra'],  // Depends on npmextra for config
-      'templates': ['npmextra', 'packagejson'],  // Depends on both
-      'gitignore': ['templates'],  // Depends on templates
-      'tsconfig': ['packagejson'],  // Depends on package.json
-      'prettier': ['cleanup', 'npmextra', 'packagejson', 'templates', 'gitignore', 'tsconfig'],  // Runs after most others
-      'readme': ['npmextra', 'packagejson'],  // Depends on project metadata
-      'copy': ['npmextra'],  // Depends on config
+      cleanup: [], // No dependencies
+      npmextra: [], // No dependencies
+      license: ['npmextra'], // Depends on npmextra for config
+      packagejson: ['npmextra'], // Depends on npmextra for config
+      templates: ['npmextra', 'packagejson'], // Depends on both
+      gitignore: ['templates'], // Depends on templates
+      tsconfig: ['packagejson'], // Depends on package.json
+      prettier: [
+        'cleanup',
+        'npmextra',
+        'packagejson',
+        'templates',
+        'gitignore',
+        'tsconfig',
+      ], // Runs after most others
+      readme: ['npmextra', 'packagejson'], // Depends on project metadata
+      copy: ['npmextra'], // Depends on config
     };
-    
+
     // Initialize all modules
     for (const [module, deps] of Object.entries(dependencies)) {
       this.moduleDependencies.set(module, {
         module,
         dependencies: new Set(deps),
-        dependents: new Set()
+        dependents: new Set(),
       });
     }
-    
+
     // Build reverse dependencies (dependents)
     for (const [module, deps] of Object.entries(dependencies)) {
       for (const dep of deps) {
@@ -48,34 +55,35 @@ export class DependencyAnalyzer {
       }
     }
   }
-  
+
   getExecutionGroups(modules: BaseFormatter[]): BaseFormatter[][] {
-    const modulesMap = new Map(modules.map(m => [m.name, m]));
+    const modulesMap = new Map(modules.map((m) => [m.name, m]));
     const executed = new Set<string>();
     const groups: BaseFormatter[][] = [];
-    
+
     while (executed.size < modules.length) {
       const currentGroup: BaseFormatter[] = [];
-      
+
       for (const module of modules) {
         if (executed.has(module.name)) continue;
-        
+
         const dependency = this.moduleDependencies.get(module.name);
         if (!dependency) {
           // Unknown module, execute in isolation
           currentGroup.push(module);
           continue;
         }
-        
+
         // Check if all dependencies have been executed
-        const allDepsExecuted = Array.from(dependency.dependencies)
-          .every(dep => executed.has(dep) || !modulesMap.has(dep));
-        
+        const allDepsExecuted = Array.from(dependency.dependencies).every(
+          (dep) => executed.has(dep) || !modulesMap.has(dep),
+        );
+
         if (allDepsExecuted) {
           currentGroup.push(module);
         }
       }
-      
+
       if (currentGroup.length === 0) {
         // Circular dependency or error - execute remaining modules
         for (const module of modules) {
@@ -84,24 +92,26 @@ export class DependencyAnalyzer {
           }
         }
       }
-      
-      currentGroup.forEach(m => executed.add(m.name));
+
+      currentGroup.forEach((m) => executed.add(m.name));
       groups.push(currentGroup);
     }
-    
+
     return groups;
   }
-  
+
   canRunInParallel(module1: string, module2: string): boolean {
     const dep1 = this.moduleDependencies.get(module1);
     const dep2 = this.moduleDependencies.get(module2);
-    
+
     if (!dep1 || !dep2) return false;
-    
+
     // Check if module1 depends on module2 or vice versa
-    return !dep1.dependencies.has(module2) && 
-           !dep2.dependencies.has(module1) &&
-           !dep1.dependents.has(module2) &&
-           !dep2.dependents.has(module1);
+    return (
+      !dep1.dependencies.has(module2) &&
+      !dep2.dependencies.has(module1) &&
+      !dep1.dependents.has(module2) &&
+      !dep2.dependents.has(module1)
+    );
   }
-}
+}

package/ts/mod_format/classes.diffreporter.ts

@@ -4,72 +4,85 @@ import { logger } from '../gitzone.logging.js';
 
 export class DiffReporter {
   private diffs: Map<string, string> = new Map();
-  
-  async generateDiff(filePath: string, oldContent: string, newContent: string): Promise<string> {
+
+  async generateDiff(
+    filePath: string,
+    oldContent: string,
+    newContent: string,
+  ): Promise<string> {
     const diff = plugins.smartdiff.createDiff(oldContent, newContent);
     this.diffs.set(filePath, diff);
     return diff;
   }
-  
+
   async generateDiffForChange(change: IPlannedChange): Promise<string | null> {
     if (change.type !== 'modify') {
       return null;
     }
-    
+
     try {
       const exists = await plugins.smartfile.fs.fileExists(change.path);
       if (!exists) {
         return null;
       }
-      
-      const currentContent = await plugins.smartfile.fs.toStringSync(change.path);
-      
+
+      const currentContent = await plugins.smartfile.fs.toStringSync(
+        change.path,
+      );
+
       // For planned changes, we need the new content
       if (!change.content) {
         return null;
       }
-      
-      return await this.generateDiff(change.path, currentContent, change.content);
+
+      return await this.generateDiff(
+        change.path,
+        currentContent,
+        change.content,
+      );
     } catch (error) {
-      logger.log('error', `Failed to generate diff for ${change.path}: ${error.message}`);
+      logger.log(
+        'error',
+        `Failed to generate diff for ${change.path}: ${error.message}`,
+      );
       return null;
     }
   }
-  
+
   displayDiff(filePath: string, diff?: string): void {
     const diffToShow = diff || this.diffs.get(filePath);
-    
+
     if (!diffToShow) {
       logger.log('warn', `No diff available for ${filePath}`);
       return;
     }
-    
+
     console.log(`\n${this.formatDiffHeader(filePath)}`);
     console.log(this.colorDiff(diffToShow));
     console.log('━'.repeat(50));
   }
-  
+
   displayAllDiffs(): void {
     if (this.diffs.size === 0) {
       logger.log('info', 'No diffs to display');
       return;
     }
-    
+
     console.log('\nFile Changes:');
     console.log('═'.repeat(50));
-    
+
     for (const [filePath, diff] of this.diffs) {
       this.displayDiff(filePath, diff);
     }
   }
-  
+
   private formatDiffHeader(filePath: string): string {
     return `📄 ${filePath}`;
   }
-  
+
   private colorDiff(diff: string): string {
     const lines = diff.split('\n');
-    const coloredLines = lines.map(line => {
+    const coloredLines = lines.map((line) => {
       if (line.startsWith('+') && !line.startsWith('+++')) {
         return `\x1b[32m${line}\x1b[0m`; // Green for additions
       } else if (line.startsWith('-') && !line.startsWith('---')) {
@@ -80,29 +93,32 @@ export class DiffReporter {
         return line;
       }
     });
-    
+
     return coloredLines.join('\n');
   }
-  
+
   async saveDiffReport(outputPath: string): Promise<void> {
     const report = {
       timestamp: new Date().toISOString(),
       totalFiles: this.diffs.size,
       diffs: Array.from(this.diffs.entries()).map(([path, diff]) => ({
         path,
-        diff
-      }))
+        diff,
+      })),
     };
-    
-    await plugins.smartfile.memory.toFs(JSON.stringify(report, null, 2), outputPath);
+
+    await plugins.smartfile.memory.toFs(
+      JSON.stringify(report, null, 2),
+      outputPath,
+    );
     logger.log('info', `Diff report saved to ${outputPath}`);
   }
-  
+
   hasAnyDiffs(): boolean {
     return this.diffs.size > 0;
   }
-  
+
   getDiffCount(): number {
     return this.diffs.size;
   }
-}
+}

package/ts/mod_format/classes.formatcontext.ts

@@ -1,65 +1,14 @@
 import * as plugins from './mod.plugins.js';
-import { RollbackManager } from './classes.rollbackmanager.js';
-import { ChangeCache } from './classes.changecache.js';
 import { FormatStats } from './classes.formatstats.js';
-import type { IFormatOperation, IFormatPlan } from './interfaces.format.js';
 
 export class FormatContext {
-  private rollbackManager: RollbackManager;
-  private currentOperation: IFormatOperation | null = null;
-  private changeCache: ChangeCache;
   private formatStats: FormatStats;
-  
+
   constructor() {
-    this.rollbackManager = new RollbackManager();
-    this.changeCache = new ChangeCache();
     this.formatStats = new FormatStats();
   }
-  
-  async beginOperation(): Promise<void> {
-    this.currentOperation = await this.rollbackManager.createOperation();
-  }
-  
-  async trackFileChange(filepath: string): Promise<void> {
-    if (!this.currentOperation) {
-      throw new Error('No operation in progress. Call beginOperation() first.');
-    }
-    await this.rollbackManager.backupFile(filepath, this.currentOperation.id);
-  }
-  
-  async commitOperation(): Promise<void> {
-    if (!this.currentOperation) {
-      throw new Error('No operation in progress. Call beginOperation() first.');
-    }
-    await this.rollbackManager.markComplete(this.currentOperation.id);
-    this.currentOperation = null;
-  }
-  
-  async rollbackOperation(): Promise<void> {
-    if (!this.currentOperation) {
-      throw new Error('No operation in progress. Call beginOperation() first.');
-    }
-    await this.rollbackManager.rollback(this.currentOperation.id);
-    this.currentOperation = null;
-  }
-  
-  async rollbackTo(operationId: string): Promise<void> {
-    await this.rollbackManager.rollback(operationId);
-  }
-  
-  getRollbackManager(): RollbackManager {
-    return this.rollbackManager;
-  }
-  
-  getChangeCache(): ChangeCache {
-    return this.changeCache;
-  }
-  
-  async initializeCache(): Promise<void> {
-    await this.changeCache.initialize();
-  }
-  
+
   getFormatStats(): FormatStats {
     return this.formatStats;
   }
-}
+}

package/ts/mod_format/classes.formatplanner.ts

@@ -10,7 +10,7 @@ export class FormatPlanner {
   private plannedChanges: Map<string, IPlannedChange[]> = new Map();
   private dependencyAnalyzer = new DependencyAnalyzer();
   private diffReporter = new DiffReporter();
-  
+
   async planFormat(modules: BaseFormatter[]): Promise<IFormatPlan> {
     const plan: IFormatPlan = {
       summary: {
@@ -18,20 +18,20 @@ export class FormatPlanner {
         filesAdded: 0,
         filesModified: 0,
         filesRemoved: 0,
-        estimatedTime: 0
+        estimatedTime: 0,
       },
       changes: [],
-      warnings: []
+      warnings: [],
     };
-    
+
     for (const module of modules) {
       try {
         const changes = await module.analyze();
         this.plannedChanges.set(module.name, changes);
-        
+
         for (const change of changes) {
           plan.changes.push(change);
-          
+
           // Update summary
           switch (change.type) {
             case 'create':
@@ -49,67 +49,51 @@ export class FormatPlanner {
         plan.warnings.push({
           level: 'error',
           message: `Failed to analyze module ${module.name}: ${error.message}`,
-          module: module.name
+          module: module.name,
         });
       }
     }
-    
-    plan.summary.totalFiles = plan.summary.filesAdded + plan.summary.filesModified + plan.summary.filesRemoved;
+
+    plan.summary.totalFiles =
+      plan.summary.filesAdded +
+      plan.summary.filesModified +
+      plan.summary.filesRemoved;
     plan.summary.estimatedTime = plan.summary.totalFiles * 100; // 100ms per file estimate
-    
+
     return plan;
   }
-  
-  async executePlan(plan: IFormatPlan, modules: BaseFormatter[], context: FormatContext, parallel: boolean = true): Promise<void> {
-    await context.beginOperation();
+
+  async executePlan(
+    plan: IFormatPlan,
+    modules: BaseFormatter[],
+    context: FormatContext,
+    parallel: boolean = false,
+  ): Promise<void> {
     const startTime = Date.now();
-    
+
     try {
-      if (parallel) {
-        // Get execution groups based on dependencies
-        const executionGroups = this.dependencyAnalyzer.getExecutionGroups(modules);
-        
-        logger.log('info', `Executing formatters in ${executionGroups.length} groups...`);
-        
-        for (let i = 0; i < executionGroups.length; i++) {
-          const group = executionGroups[i];
-          logger.log('info', `Executing group ${i + 1}: ${group.map(m => m.name).join(', ')}`);
-          
-          // Execute modules in this group in parallel
-          const promises = group.map(async (module) => {
-            const changes = this.plannedChanges.get(module.name) || [];
-            if (changes.length > 0) {
-              logger.log('info', `Executing ${module.name} formatter...`);
-              await module.execute(changes);
-            }
-          });
-          
-          await Promise.all(promises);
-        }
-      } else {
-        // Sequential execution (original implementation)
-        for (const module of modules) {
-          const changes = this.plannedChanges.get(module.name) || [];
-          
-          if (changes.length > 0) {
-            logger.log('info', `Executing ${module.name} formatter...`);
-            await module.execute(changes);
-          }
+      // Always use sequential execution to avoid race conditions
+      for (const module of modules) {
+        const changes = this.plannedChanges.get(module.name) || [];
+
+        if (changes.length > 0) {
+          logger.log('info', `Executing ${module.name} formatter...`);
+          await module.execute(changes);
         }
       }
-      
+
       const endTime = Date.now();
       const duration = endTime - startTime;
       logger.log('info', `Format operations completed in ${duration}ms`);
-      
-      await context.commitOperation();
     } catch (error) {
-      await context.rollbackOperation();
       throw error;
     }
   }
-  
-  async displayPlan(plan: IFormatPlan, detailed: boolean = false): Promise<void> {
+
+  async displayPlan(
+    plan: IFormatPlan,
+    detailed: boolean = false,
+  ): Promise<void> {
     console.log('\nFormat Plan:');
     console.log('━'.repeat(50));
     console.log(`Summary: ${plan.summary.totalFiles} files will be changed`);
@@ -118,7 +102,7 @@ export class FormatPlanner {
     console.log(`  • ${plan.summary.filesRemoved} deleted files`);
     console.log('');
     console.log('Changes by module:');
-    
+
     // Group changes by module
     const changesByModule = new Map<string, IPlannedChange[]>();
     for (const change of plan.changes) {
@@ -126,14 +110,16 @@ export class FormatPlanner {
       moduleChanges.push(change);
       changesByModule.set(change.module, moduleChanges);
     }
-    
+
     for (const [module, changes] of changesByModule) {
-      console.log(`\n${this.getModuleIcon(module)} ${module} (${changes.length} ${changes.length === 1 ? 'file' : 'files'})`);
-      
+      console.log(
+        `\n${this.getModuleIcon(module)} ${module} (${changes.length} ${changes.length === 1 ? 'file' : 'files'})`,
+      );
+
       for (const change of changes) {
         const icon = this.getChangeIcon(change.type);
         console.log(`  ${icon} ${change.path} - ${change.description}`);
-        
+
         // Show diff for modified files if detailed view is requested
         if (detailed && change.type === 'modify') {
           const diff = await this.diffReporter.generateDiffForChange(change);
@@ -143,7 +129,7 @@ export class FormatPlanner {
         }
       }
     }
-    
+
     if (plan.warnings.length > 0) {
       console.log('\nWarnings:');
       for (const warning of plan.warnings) {
@@ -151,26 +137,26 @@ export class FormatPlanner {
         console.log(`  ${icon} ${warning.message}`);
       }
     }
-    
+
     console.log('\n' + '━'.repeat(50));
   }
-  
+
   private getModuleIcon(module: string): string {
     const icons: Record<string, string> = {
-      'packagejson': '📦',
-      'license': '📝',
-      'tsconfig': '🔧',
-      'cleanup': '🚮',
-      'gitignore': '🔒',
-      'prettier': '✨',
-      'readme': '📖',
-      'templates': '📄',
-      'npmextra': '⚙️',
-      'copy': '📋'
+      packagejson: '📦',
+      license: '📝',
+      tsconfig: '🔧',
+      cleanup: '🚮',
+      gitignore: '🔒',
+      prettier: '✨',
+      readme: '📖',
+      templates: '📄',
+      npmextra: '⚙️',
+      copy: '📋',
     };
     return icons[module] || '📁';
   }
-  
+
   private getChangeIcon(type: 'create' | 'modify' | 'delete'): string {
     switch (type) {
       case 'create':
@@ -181,4 +167,4 @@ export class FormatPlanner {
         return '❌';
     }
   }
-}
+}